Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/common/centerorderSve.js

@@ -647,7 +647,7 @@ class CenterorderService extends AppServiceBase {
           if (addRes && addRes.stdout) {
           if (addRes && addRes.stdout) {
             var salesmanRes = JSON.parse(addRes.stdout);
             var salesmanRes = JSON.parse(addRes.stdout);
             if (salesmanRes.status == 0) {
             if (salesmanRes.status == 0) {
-              deliveryObj.needsolution = salesmanRes.data;
+              deliveryObj.actionBody.needsolution = salesmanRes.data;
               await this.utilsPushSve.baiduBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
               await this.utilsPushSve.baiduBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
             }
             }
           }
           }

center-channel/app/base/service/impl/utilsSve/utilsDeliverSystemSve.js

@@ -36,8 +36,7 @@ class UtilsDeliverSystemService extends AppServiceBase {
       },
       },
       requestId: pobj.requestId || "" // N 请求id
       requestId: pobj.requestId || "" // N 请求id
     }
     }
-
-    this.opQueuePushClientPost(pobj, this.opPushQueueUrl, reqParams);
+    await this.opQueuePushClientPost(pobj, this.opPushQueueUrl, reqParams);
   }
   }
 
 
   //--------------------------------------------------内部辅助方法-------------------start-----------------
   //--------------------------------------------------内部辅助方法-------------------start-----------------