1

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -362,6 +362,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     fsWxExpressTask.setResponseBody(JSON.toJSONString(response));
                 }
             }catch (Exception e){
+                e.printStackTrace();
                 logger.error("该单 {} 推送到物流失败！",fsWxExpressTask,e);
                 fsWxExpressTask.setRetryCount(fsWxExpressTask.getRetryCount() +1);
                 fsWxExpressTask.setStatus(3);
@@ -1227,6 +1228,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             fsWxExpressTask.setUserId(order.getUserId());
             fsWxExpressTask.setStatus(0);
             fsWxExpressTask.setRetryCount(0);
+            fsWxExpressTask.setType(0);
             fsWxExpressTask.setCreateTime(LocalDateTime.now());
             fsWxExpressTask.setUpdateTime(LocalDateTime.now());
             fsWxExpressTask.setOrderCode(order.getOrderCode());
@@ -1366,6 +1368,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
     @Override
     public R getExpress(FsStoreOrder order) {
+        FsStoreDelivers fsStoreDelivers = fsStoreDeliversMapper.findByOrderCode(order.getOrderCode());
+        order.setDeliveryId(fsStoreDelivers.getDeliverId());
+        order.setDeliverySn(fsStoreDelivers.getDeliverSn());
+        order.setDeliveryName(fsStoreDelivers.getDeliverName());
         //顺丰轨迹查询处理
         String lastFourNumber = "";
         if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue())) {
@@ -3641,7 +3647,12 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         } else {
             order=orderService.selectFsStoreOrderById(orderId);
         }
-
+        FsStoreDelivers fsStoreDelivers = fsStoreDeliversMapper.findByOrderCode(order.getOrderCode());
+        if (ObjectUtil.isNotEmpty(fsStoreDelivers)){
+            order.setDeliveryId(fsStoreDelivers.getDeliverId());
+            order.setDeliverySn(fsStoreDelivers.getDeliverSn());
+            order.setDeliveryName(fsStoreDelivers.getDeliverName());
+        }
         order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
         order.setUserAddress(ParseUtils.parseIdCard(order.getUserAddress()));
         List<FsStoreOrderItemVO> list=itemService.selectFsStoreOrderItemListByOrderId(orderId);