FEAT: 同步快递

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -2145,7 +2145,15 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 lastFourNumber = StrUtil.sub(jm, jm.length(), -4);
             }
         }
-        ExpressInfoDTO dto = expressService.getExpressInfo(order.getOrderCode(), order.getDeliveryCode(), order.getDeliverySn(), lastFourNumber);
+
+
+        List<FsStoreDelivers> byOrderId = fsStoreDeliversMapper.findByOrderIdWithType(order.getOrderId(),1);
+        if (byOrderId.isEmpty()) {
+            return R.error("当前账号没有快递记录！");
+        }
+        FsStoreDelivers delivers = byOrderId.get(0);
+
+        ExpressInfoDTO dto = expressService.getExpressInfo(order.getOrderCode(), delivers.getDeliverSn(), delivers.getDeliverId(), lastFourNumber);
         log.info("快递鸟查询dto:{}", JSONUtil.toJsonStr(dto));
         if (!dto.isSuccess()) {
             return R.error(dto.getReason());
@@ -2158,7 +2166,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                     lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
                 }
             }
-            dto = expressService.getExpressInfo(order.getOrderCode(), order.getDeliveryCode(), order.getDeliverySn(), lastFourNumber);
+            dto = expressService.getExpressInfo(order.getOrderCode(), delivers.getDeliverSn(), delivers.getDeliverId(), lastFourNumber);
         }
         LiveOrder updateEntity = new LiveOrder();
         updateEntity.setOrderId(order.getOrderId());
@@ -2182,7 +2190,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         updateEntity.setOrderId(order.getOrderId());
         updateEntity.setUpdateTime(new DateTime());
         updateEntity.setFinishTime(new Date());
-        updateEntity.setStatus(OrderInfoEnum.STATUS_3.getValue());
+        updateEntity.setStatus(4);
         log.info("确认收货：" + orderId);
 //        log.info("确认收货："+orderId);
 //        if (order.getCompanyId()!=null&&order.getTuiMoneyStatus()==0&&order.getPayType()==1){