修改

center-channel/app/base/service/impl/receiveSve/icpOrderSve.js

@@ -36,7 +36,7 @@ class IcpOrderService extends AppServiceBase {
         if (productItem.status != 0) {
             return system.getResultFail(-5010, "产品查询失败，6100002");
         }
-        console.log("productItem......................",JSON.stringify(productItem))
+        console.log("productItem......................", JSON.stringify(productItem))
         pobj.userInfo = {channel_userid: pobj.userName || ""}
 
         pobj.actionBody = {
@@ -130,34 +130,37 @@ class IcpOrderService extends AppServiceBase {
         }
         console.log("yfObj......................................................", JSON.stringify(yfObj))
         let yunfuPushRes = await this.utilsPushSve.business2Channel(yfObj, "pushOrderICPBusinessNew");
+        let deliveryObj = {
+            actionBody: {
+                orderNo: solutionItem.data.orderNo,
+                needsolution: solutionItem.data.solutionContent,
+                channelNeedNo: solutionItem.data.channelNeedNo,
+                channelSolutionNo: solutionItem.data.channelSolutionNo,
+                skuCode: productItem.data.payCode,
+                servicer: {
+                    code: 'gsb',
+                    name: '公司宝'
+                }
+            },
+            appInfo: pobj.appInfo
+        };
         if (pobj.actionBody.isDirectBuy && pobj.actionBody.isDirectBuy == 1) {//直接下单需执行添加订单业务员操作
             if (yunfuPushRes && yunfuPushRes.status == 0) {
                 if (yunfuPushRes.data && yunfuPushRes.data.data) {
-                    let deliveryObj = {
-                        actionBody: {
-                            orderNo: yunfuPushRes.data.orderNo,
-                            needsolution: yunfuPushRes.data.solutionContent,
-                            channelNeedNo: yunfuPushRes.data.channelNeedNo,
-                            channelSolutionNo: yunfuPushRes.data.channelSolutionNo,
-                            skuCode: productItem.data.payCode,
-                            servicer: {
-                                code: 'gsb',
-                                name: '公司宝'
-                            }
-                        },
-                        appInfo: pobj.appInfo
-                    };
                     let resData = yunfuPushRes.data.data;
                     let salesmanInfo = {
                         salesmanName: resData.orderList && resData.orderList.length > 0 ? resData.orderList[0].operatorName : "",
                         salesmanChannelId: resData.orderList && resData.orderList.length > 0 ? resData.orderList[0].operator : "",
                     };
-                    deliveryObj.actionBody.needsolution = {salesmanInfo: salesmanInfo, orderNo: orderItem.data.orderNo}
-                    console.log("deliveryObj......................................................", JSON.stringify(deliveryObj))
-                    this.utilsPushSve.business2Channel(deliveryObj, "pushDeliveryOrder");
+                    deliveryObj.actionBody.needsolution.salesmanInfo = salesmanInfo;
+                    deliveryObj.actionBody.needsolution.orderNo = orderItem.data.orderNo;
                 }
             }
         }
+        if (pobj.actionBody.isDirectBuy && pobj.actionBody.isDirectBuy == 1) {
+            console.log("deliveryObj......................................................", JSON.stringify(deliveryObj))
+            this.utilsPushSve.business2Channel(deliveryObj, "pushDeliveryOrder");
+        }
         return system.getResultSuccess(null);
     }