tj

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -376,10 +376,11 @@ class OrderInfoService extends ServiceBase {
       updated: actionBody.updated,
       updated: actionBody.updated,
       flowList: []
       flowList: []
     };
     };
-    var deliveryInfo = await this.getOrderDeliveryInfo(pobj);
+    pobj.actionBody.sourceOrderNo = actionBody.orderNo;
+    var deliveryInfo = await this.getOrderDeliveryFlowInfo(pobj);
     var addi = 0;
     var addi = 0;
-    if (deliveryInfo.status == 0 && deliveryInfo.data && deliveryInfo.data.length > 0) {
-      updateDeliveryInfo = deliveryInfo.data;
+    if (deliveryInfo.status == 0 && deliveryInfo.data && deliveryInfo.data.flowList.length > 0) {
+      updateDeliveryInfo.flowList = deliveryInfo.data.flowList;
     } else {
     } else {
       updateDeliveryInfo = {
       updateDeliveryInfo = {
         orderDeliveryStatus: "已下单",
         orderDeliveryStatus: "已下单",
@@ -393,6 +394,11 @@ class OrderInfoService extends ServiceBase {
       };
       };
       addi = 1;
       addi = 1;
     }
     }
+    updateDeliveryInfo.updated = actionBody.updated;
+    updateDeliveryInfo.orderDeliveryStatus = actionBody.orderDeliveryStatus;
+    var tempList = actionBody.orderDeliveryStatusName.split('-');
+    updateDeliveryInfo.orderDeliveryStatusName = tempList[tempList.length - 1];
+
     var dataIndex = updateDeliveryInfo.flowList.findIndex(f => f.orderDeliveryStatus == actionBody.orderDeliveryStatus);
     var dataIndex = updateDeliveryInfo.flowList.findIndex(f => f.orderDeliveryStatus == actionBody.orderDeliveryStatus);
     if (dataIndex > -1) {
     if (dataIndex > -1) {
       updateDeliveryInfo.flowList[dataIndex].orderDeliveryStatusName = actionBody.orderDeliveryStatusName;
       updateDeliveryInfo.flowList[dataIndex].orderDeliveryStatusName = actionBody.orderDeliveryStatusName;