FIX: 兼容原有快递模块

fs-service-system/src/main/java/com/fs/express/impl/FsStoreDeliversServiceImpl.java

@@ -279,6 +279,7 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
                     userPhone = fsStoreOrder.getUserPhone();
                 }
             }
+            deliveryDTO.setType(0);
 
 
             fsStoreDeliversMapper.insert(deliveryDTO);

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

@@ -665,6 +665,18 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
     @Override
     public LiveOrder selectLiveOrderByOrderId(String orderId)
     {
+        LiveOrder liveOrder = baseMapper.selectLiveOrderByOrderId(orderId);
+        if(ObjectUtil.isNull(liveOrder)) {
+            throw new RuntimeException("该订单没有找到！");
+        }
+        List<FsStoreDelivers> byOrderIdWithType = fsStoreDeliversMapper.findByOrderIdWithType(Long.valueOf(orderId), 1);
+        if(CollectionUtils.isNotEmpty(byOrderIdWithType)) {
+            FsStoreDelivers delivers = byOrderIdWithType.get(0);
+
+            liveOrder.setDeliveryCode(delivers.getDeliverSn());
+            liveOrder.setDeliveryName(delivers.getDeliverName());
+            liveOrder.setDeliverySn(delivers.getDeliverId());
+        }
         return baseMapper.selectLiveOrderByOrderId(orderId);
     }
 
@@ -1270,19 +1282,20 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             order.setDeliveryCode(express.getCode());
 
             baseMapper.updateLiveOrder(order);
-//            if(ObjectUtil.isNotNull(express)) {
-//                FsStoreDelivers fsStoreDeliver = new FsStoreDelivers();
-//                fsStoreDeliver.setOrderId(order.getOrderId());
-//                fsStoreDeliver.setOrderCode(orderCode);
-//                fsStoreDeliver.setDeliverId(deliveryId);
-//                fsStoreDeliver.setDeliverSn(express.getCode());
-//                fsStoreDeliver.setDeliverName(express.getName());
-//                fsStoreDeliver.setCreateTime(LocalDateTime.now());
-//                fsStoreDeliver.setUpdateTime(LocalDateTime.now());
-//                fsStoreDeliver.setCreateBy("admin");
-//                fsStoreDeliver.setUpdateBy("admin");
-//                fsStoreDeliversMapper.insert(fsStoreDeliver);
-//            }
+            if(ObjectUtil.isNotNull(express)) {
+                FsStoreDelivers fsStoreDeliver = new FsStoreDelivers();
+                fsStoreDeliver.setOrderId(order.getOrderId());
+                fsStoreDeliver.setOrderCode(orderCode);
+                fsStoreDeliver.setDeliverId(deliveryId);
+                fsStoreDeliver.setDeliverSn(express.getCode());
+                fsStoreDeliver.setDeliverName(express.getName());
+                fsStoreDeliver.setCreateTime(LocalDateTime.now());
+                fsStoreDeliver.setUpdateTime(LocalDateTime.now());
+                fsStoreDeliver.setCreateBy("admin");
+                fsStoreDeliver.setUpdateBy("admin");
+                fsStoreDeliver.setType(1);
+                fsStoreDeliversMapper.insert(fsStoreDeliver);
+            }
             FsWxExpressTask fsWxExpressTask = new FsWxExpressTask();
             fsWxExpressTask.setUserId(Long.valueOf(order.getUserId()));
             fsWxExpressTask.setStatus(0);