fix: 修复平台端商户订单与打印页测试问题

修复平台管理员在商户订单页查看详情等操作时出现“订单不存在”的问题,并完善商户订单查询筛选逻辑。同步修复商户订单打印页电话展示与积分信息展示,满足测试项要求。

Made-with: Cursor
This commit is contained in:
AriadenCaseblg
2026-04-12 10:46:37 +08:00
parent 37e08a5a14
commit b3d80c3c50
6 changed files with 73 additions and 18 deletions

View File

@@ -45,6 +45,8 @@ public class ManageOrderServiceImpl implements ManageOrderService {
@Autowired
private OrderService orderService;
@Autowired
private com.zbkj.service.service.MerchantOrderService merchantOrderService;
@Autowired
private ReservationWorkOrderService reservationWorkOrderService;
@Autowired
private SyncOrderDetailStagingDao syncOrderDetailStagingDao;
@@ -241,6 +243,11 @@ public class ManageOrderServiceImpl implements ManageOrderService {
if (orderInfo == null) {
throw new CrmebException("订单不存在");
}
// 打印页要求展示完整收货电话,不走全局手机号脱敏展示
com.zbkj.common.model.order.MerchantOrder merchantOrder = merchantOrderService.getOneByOrderNo(orderNo);
if (merchantOrder != null) {
orderInfo.setUserPhone(merchantOrder.getUserPhone());
}
// 从staging表查询商品详情
LambdaQueryWrapper<SyncOrderDetailStaging> queryWrapper = new LambdaQueryWrapper<>();