wdy

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

@@ -251,12 +251,9 @@ class CenterorderService extends AppServiceBase {
     if (orderrtn.status != 0 && orderrtn.status != -1) {
       return system.getResultFail(-5012, "订单创建失败");
     }
-    console.log(orderrtn.data);
     if (orderrtn.data) {
-      console.log("-----------------------------------------------------------");
       pobj.actionBody.orderNo = orderrtn.data.orderNo;
     }
-    console.log(pobj.actionBody);
     pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId;
 
     pobj.actionType = "receiveSolutionPayInfo";

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

@@ -11,6 +11,7 @@ class UtilsNeedService extends AppServiceBase {
     this.aliclient = system.getObject("util.aliyunClient");
     this.ossClient = system.getObject("util.ossClient");
     this.restClient = system.getObject("util.restClient");
+    this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
   }
 
   /**
@@ -188,14 +189,24 @@ class UtilsNeedService extends AppServiceBase {
     if (!actionBody.channelNeedNo) {
       return system.getResult(null, "actionBody.channelNeedNo can not be empty，100395");
     }
+    if (!actionBody.note) {
+      return system.getResult(null, "actionBody.note can not be empty，100395");
+    }
     var self = this;
     pobj.actionBody.intentionBizId = pobj.actionBody.channelNeedNo;
-    pobj.actionType = "needClose"
+    pobj.actionType = "abolishIcpProgrammeByNeed"
     var reqUrl = this.centerOrderUrl + "action/need/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
     if (result.status == 0) {
+      if (result.data) {
+        pobj.actionBody.orderNo = result.data;
+        var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
+        if (orderrtn.status < 0) {
+          return system.getResultFail(-5022, "订单关闭失败");
+        }
+      }
       // 推送ali
-      await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo }, apiVersion: "2019-05-08" });
+      await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo, Note: actionBody.note }, apiVersion: "2019-05-08" });
       self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
       return system.getResultSuccess();
     } else {
@@ -267,8 +278,13 @@ class UtilsNeedService extends AppServiceBase {
         appInfo: pobj.appInfo
       }
       this.utilsPushSve.aliBusiness2Delivery(tmpObj, "pushDeliveryStatusNotify");
-      tmpObj.actionBody.orderNo=rtn.data.channelSolutionNo;
+      tmpObj.actionBody.orderNo = rtn.data.channelSolutionNo;
+      pobj.actionBody.orderNo = rtn.data.orderNo;
       if (actionBody.status == 11) {
+        var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
+        if (orderrtn.status < 0) {
+          return system.getResultFail(-5022, "订单关闭失败");
+        }
         self.utilsPushSve.aliBusiness2Fq(tmpObj, "pushOrderICPClose");
       }
     }//通知更新状态