修改接口

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

@@ -167,41 +167,42 @@ class IcpOrderService extends AppServiceBase {
     }
     }
 
 
     async closeOrder(pobj) {
     async closeOrder(pobj) {
+        let channelOrderNo = pobj.orderNo;
+        pobj.actionBody.orderNo = channelOrderNo;
+        pobj.actionType = "icpOrderClose";
         let url = settings.centerOrderUrl() + "action/qcapi/springBoard";
         let url = settings.centerOrderUrl() + "action/qcapi/springBoard";
         let rtn = await this.restPostUrl(pobj, url);
         let rtn = await this.restPostUrl(pobj, url);
-        if (rtn.status == 0 && rtn.data) {
-            let channelOrderNo = pobj.orderNo;
-            pobj.actionBody.orderNo = rtn.data.orderNo;
-            pobj.actionType = "channeldelOrder";
-            let orderRes = await this.utilsOrderSve.delOrder(pobj, pobj.actionBody);
-            if (orderRes.status < 0) {
-                return system.getResultFail(-5022, "订单关闭失败，6100006");
-            }
-            let tmpObj = {
-                actionBody: {
-                    orderNo: rtn.data.orderNo,
-                    channelNeedNo: rtn.data.channelNeedNo,
-                    needsolution: rtn.data.solutionContent
-                },
-                appInfo: pobj.appInfo
-            }
-            this.utilsPushSve.business2Channel(tmpObj, "pushDeliveryStatusNotify");
-            // tmpObj.actionBody.orderNo = channelOrderNo;
-            let tmpObj2 = {
-                actionBody: {
-                    orderNo: channelOrderNo,
-                    channelNeedNo: rtn.data.channelNeedNo || channelOrderNo,//做云服和企服通没有渠道需求号的兼容
-                    needsolution: rtn.data.solutionContent
-                },
-                appInfo: pobj.appInfo
-            };
-            this.utilsPushSve.business2Channel(tmpObj2, "pushOrderICPClose");
-        }//通知更新状态
-        else {
-            return system.getResultFail(-5010, "订单创建失败，6100007");
+        console.log("rtn.....................", rtn)
+        if (rtn.status != 0 || !rtn.data) {
+            return system.getResultFail(-5010, "订单关闭失败，6100006");
+        }
+        // if (rtn.status == 0 && rtn.data) {
+        //     pobj.actionType = "channeldelOrder";
+        //     let orderRes = await this.utilsOrderSve.delOrder(pobj, pobj.actionBody);
+        //     if (orderRes.status < 0) {
+        //         return system.getResultFail(-5022, "订单关闭失败，6100007");
+        //     }
+        let tmpObj = {
+            actionBody: {
+                orderNo: rtn.data.orderNo,
+                channelNeedNo: rtn.data.channelNeedNo,
+                needsolution: rtn.data.solutionContent
+            },
+            appInfo: pobj.appInfo
         }
         }
-        return rtn;
+        this.utilsPushSve.business2Channel(tmpObj, "pushDeliveryStatusNotify");
+        let tmpObj2 = {
+            actionBody: {
+                orderNo: channelOrderNo,
+                channelNeedNo: channelOrderNo,//做云服和企服通没有渠道需求号的兼容
+                needsolution: rtn.data.solutionContent
+            },
+            appInfo: pobj.appInfo
+        };
+        this.utilsPushSve.business2Channel(tmpObj2, "pushOrderICPClose");
+        return system.getResultSuccess(null);
     }
     }
 }
 }
 
 
-module.exports = IcpOrderService;
+module
\ No newline at end of file
+    .exports = IcpOrderService;
\ No newline at end of file