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

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

@@ -1141,6 +1141,9 @@ class UtilsNeedService extends AppServiceBase {
           orderStatus: 2
           orderStatus: 2
         }
         }
         var orderrtn = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
         var orderrtn = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
+        console.log("orderrtn---------------start");
+        console.log(orderrtn)
+        console.log("orderrtn---------------end")
         if (orderrtn.status != 0 && orderrtn.status != -1) {
         if (orderrtn.status != 0 && orderrtn.status != -1) {
           return system.getResultFail(-5012, "订单创建失败");
           return system.getResultFail(-5012, "订单创建失败");
         }
         }
@@ -1178,7 +1181,8 @@ class UtilsNeedService extends AppServiceBase {
         }
         }
         var deliveryObj = {
         var deliveryObj = {
           actionBody: {
           actionBody: {
-            orderNo: orderrtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
+            // 2020 1019 lin 修改 orderrtn.data.orderNo 为 pobj.actionBody.orderNo
+            orderNo: pobj.actionBody.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
             needsolution: solutiondata.data.solutionContent,
             needsolution: solutiondata.data.solutionContent,
             channelNeedNo: solutiondata.data.channelNeedNo,
             channelNeedNo: solutiondata.data.channelNeedNo,
             channelSolutionNo: solutiondata.data.channelSolutionNo,
             channelSolutionNo: solutiondata.data.channelSolutionNo,