fix(order): 修复订单发货物流信息设置问题

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderDeliverServiceImpl.java

@@ -191,14 +191,14 @@ public class OrderDeliverServiceImpl extends ServiceImpl<OrderDeliverMapper, Ord
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<OrderDeliver> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(OrderDeliver::getId);
-        
+
         // 处理订单ID查询：支持查询当前订单及其所有子订单的发货记录
         if (bo.getOrderId() != null) {
             // 获取当前订单及其所有子订单的ID列表
             List<Long> targetOrderIds = getAllChildOrderIds(bo.getOrderId());
             lqw.in(OrderDeliver::getOrderId, targetOrderIds);
         }
-        
+
         lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), OrderDeliver::getOrderCode, bo.getOrderCode());
         lqw.eq(StringUtils.isNotBlank(bo.getLogisticPackNo()), OrderDeliver::getLogisticPackNo, bo.getLogisticPackNo());
         lqw.eq(StringUtils.isNotBlank(bo.getDeliverMethod()), OrderDeliver::getDeliverMethod, bo.getDeliverMethod());
@@ -331,9 +331,9 @@ public class OrderDeliverServiceImpl extends ServiceImpl<OrderDeliverMapper, Ord
                         zhongCheOrderDeliverBo.setExpressCode(bo.getLogisticNo());
                         zhongCheOrderDeliverBo.setExpressCompanyName(bo.getLogisticsCompanyName());
                     } else {
-//                        String companyName = remoteComLogisticsCompanyService.selectLogisticsCompanyNameById(bo.getLogisticsCompanyId());
+                        String companyName = remoteComLogisticsCompanyService.selectLogisticsCompanyNameById(bo.getLogisticsCompanyId());
                         zhongCheOrderDeliverBo.setExpressCode(bo.getLogisticNo());
-                        zhongCheOrderDeliverBo.setExpressCompanyName(null);
+                        zhongCheOrderDeliverBo.setExpressCompanyName(companyName);
                     }
                 }
                 List<OrderDeliverGoods> orderDeliverGoods = bo.getOrderDeliverProducts().stream().map(orderDeliverProductBo -> {
@@ -343,13 +343,13 @@ public class OrderDeliverServiceImpl extends ServiceImpl<OrderDeliverMapper, Ord
                     return zhongCheOrderDeliverGoods;
                 }).toList();
                 zhongCheOrderDeliverBo.setOrderDeliverGoods(orderDeliverGoods);
-//                ZhongCheOrderDeliverVo zhongCheOrderDeliverVo = remoteZhongChePullService.mallOrderDeliverGoods(zhongCheOrderDeliverBo);
+                ZhongCheOrderDeliverVo zhongCheOrderDeliverVo = remoteZhongChePullService.mallOrderDeliverGoods(zhongCheOrderDeliverBo);
                 //保存第三方订单发货信息
                 OrderDeliverThird orderDeliverThird = new OrderDeliverThird();
                 orderDeliverThird.setDeliverId(deliver.getId());
                 orderDeliverThird.setOrderId(orderId);
-                orderDeliverThird.setOutgoingCode(null);
-//                orderDeliverThirdService.save(orderDeliverThird);
+                orderDeliverThird.setOutgoingCode(zhongCheOrderDeliverVo.getOutgoingCode());
+                orderDeliverThirdService.save(orderDeliverThird);
             }
             /*同济订单发货后调用接口通知同济*/
             if ("tongji".equals(orderMain.getDataSource())) {