更新系统

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

@@ -571,6 +571,16 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                 so.setOrderCaseDate(sdf.parse(deliveryTime));
                                 so.setSalesDeliverTime(sdf.parse(deliveryTime));
                                 so.setSalesSendTime(sdf.parse(deliveryTime));
+                            } else {
+                                if (job.has("info")) {
+                                    JSONObject info = job.getJSONObject("info");
+                                    if (info.has("deliveryTime")) {
+                                        String deliveryTime = info.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){
@@ -1194,6 +1204,14 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             if (logistics.has("deliveryTime")) {
                 String deliveryTime = logistics.getString("deliveryTime");
                 salesOrder.setSalesDeliverTime(sdf.parse(deliveryTime));
+            } else {
+                if (job.has("info")) {
+                    JSONObject info = job.getJSONObject("info");
+                    if (info.has("deliveryTime")) {
+                        String deliveryTime = info.getString("deliveryTime");
+                        salesOrder.setSalesDeliverTime(sdf.parse(deliveryTime));
+                    }
+                }
             }
             switch (companyCode){
                 case "2087":{