更新系统

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -537,7 +537,6 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
 
                             String companyCode = logistics.getString("companyCode");
                             String deliveryNo = logistics.getString("deliveryNo");
-                            String deliveryTime = logistics.getString("deliveryTime");
 
                             SalesOrder so = new SalesOrder();
                             switch (companyCode){
@@ -567,9 +566,12 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                             so.setSalesStatus(1);
                             so.setSalesShippingStatus(1);
                             so.setSalesDeliver(2);
-                            so.setOrderCaseDate(sdf.parse(deliveryTime));
-                            so.setSalesDeliverTime(sdf.parse(deliveryTime));
-                            so.setSalesSendTime(sdf.parse(deliveryTime));
+                            if (logistics.has("deliveryTime")) {
+                                String deliveryTime = logistics.getString("deliveryTime");
+                                so.setOrderCaseDate(sdf.parse(deliveryTime));
+                                so.setSalesDeliverTime(sdf.parse(deliveryTime));
+                                so.setSalesSendTime(sdf.parse(deliveryTime));
+                            }
                             Integer res = salesOrderMapper.updateSalesOrder(so);
                             if(res > 0){
                                 //添加操作跟踪信息