发货时间同步erp

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1143,8 +1143,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
     @Override
     public void deliveryOrder(String orderCode,String extendOrderId, String deliveryId, String deliverCode, String deliverName) {
-
-
         FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
         if (order != null && order.getStatus() == OrderInfoEnum.STATUS_1.getValue()) {
             // 查询订单出库时间
@@ -1160,11 +1158,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 }
             }
 
-            if(StringUtils.isEmpty(consignTime)){
-                logger.info("发货时间为空不更新状态，订单:{}",orderCode);
-                return;
-            }
-
             FsExpressScrm express = expressService.selectFsExpressByOmsCode(deliverCode);
             if (express != null) {
                 order.setDeliveryName(deliverName);
@@ -1172,7 +1165,14 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             }
             order.setStatus(OrderInfoEnum.STATUS_2.getValue());
             order.setDeliveryId(deliveryId);
-            order.setDeliverySendTime(DateUtils.parseDate(consignTime));
+            if(StringUtils.isEmpty(consignTime)){
+                // 后期优化
+                logger.info("发货时间为空更新为当前时间，订单:{}",orderCode);
+                order.setDeliverySendTime(new Date());
+            }else {
+                order.setDeliverySendTime(DateUtils.parseDate(consignTime));
+            }
+
 
             fsStoreOrderMapper.updateFsStoreOrder(order);
             orderStatusService.create(order.getId(), OrderLogEnum.DELIVERY_GOODS.getValue(),