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

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

@@ -266,6 +266,28 @@ class QcCenterOrderService extends AppServiceBase {
       solution = JSON.parse(solution);
       solution = solution.solution
       solution = JSON.stringify(solution)
+
+      //推送交付系统
+      var reqParams = {
+        actionBody: {
+          intentionBizId: res.data.needinfo.channelNeedNo,
+          status: "beforeConfirmation"
+        },
+        opType: "updateChanceStatus",
+        appInfo: pobj.appInfo
+      }
+      var self = this;
+      self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus");
+      //日志记录
+      self.logCtl.info({
+        appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
+        appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
+        requestId: pobj.requestId || "",
+        op: "service/impl/common/qcCenterOrderSve.js/submitWangwenSolution",
+        content: JSON.stringify(reqParams),
+        resultInfo: "",
+        optitle: "updateChanceStatus推送蜂擎获取的接口信息->aliBusiness2Delivery",
+      });
       //推送数据至阿里
       var pushObj = {
         intentionBizId: res.data.needinfo.channelNeedNo,
@@ -274,7 +296,7 @@ class QcCenterOrderService extends AppServiceBase {
         solution: solution
       };
       console.log("wangwen",pushObj);
-      var self = this;
+      
       this.pushSubmitSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
       return system.getResultSuccess();
     }
@@ -316,15 +338,6 @@ class QcCenterOrderService extends AppServiceBase {
     pobj.actionType = "abolishIcpProgrammeByNeed"
     var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
-    this.logCtl.info({
-      appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
-      appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
-      requestId: pobj.requestId || "",
-      op: "service/impl/utilsSve/utilsNeedSve.js/closeNeed",
-      content: JSON.stringify(pobj),
-      resultInfo: JSON.stringify(result),
-      optitle: "abolishIcpProgrammeByNeed推送蜂擎获取的接口信息->aliBusiness2Delivery",
-    });
     if (result.status == 0) {
       if (result.data) {
         pobj.actionBody.orderNo = result.data;
@@ -338,7 +351,7 @@ class QcCenterOrderService extends AppServiceBase {
       var reqParams = {
         actionBody: {
           intentionBizId: pobj.actionBody.needNo,
-          status: "closeNeed"
+          status: "isClosed"
         },
         opType: "updateChanceStatus",
         appInfo: pobj.appInfo
@@ -349,7 +362,7 @@ class QcCenterOrderService extends AppServiceBase {
         appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
         appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
         requestId: pobj.requestId || "",
-        op: "service/impl/utilsSve/utilsNeedSve.js/closeNeed",
+        op: "service/impl/commen/qcCenterOrderSve.js/closeNeed",
         content: JSON.stringify(reqParams),
         resultInfo: "",
         optitle: "updateChanceStatus推送蜂擎获取的接口信息->aliBusiness2Delivery",
@@ -459,6 +472,28 @@ async submitFoodSolution(pobj) {
     solution = JSON.parse(solution);
     solution = solution.solution
     solution = JSON.stringify(solution)
+
+      //推送交付系统
+      var reqParams = {
+        actionBody: {
+          intentionBizId: pobj.actionBody.needNo,
+          status: "beforeConfirmation"
+        },
+        opType: "updateChanceStatus",
+        appInfo: pobj.appInfo
+      }
+      var self = this;
+      self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus");
+      //日志记录
+      self.logCtl.info({
+        appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
+        appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
+        requestId: pobj.requestId || "",
+        op: "service/impl/commen/qcCenterOrderSve.js/submitFoodSolution",
+        content: JSON.stringify(reqParams),
+        resultInfo: "",
+        optitle: "updateChanceStatus推送蜂擎获取的接口信息->aliBusiness2Delivery",
+      });
     //推送数据至阿里
     var pushObj = {
       intentionBizId: res.data.needinfo.channelNeedNo,
@@ -467,7 +502,6 @@ async submitFoodSolution(pobj) {
       solution: solution
     };
     console.log("food",pushObj);
-    var self = this;
     this.pushSubmitSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
     return system.getResultSuccess();
   }
@@ -489,15 +523,7 @@ async foodCloseNeed(pobj) {
   pobj.actionType = "abolishIcpProgrammeByNeed"
   var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
   var result = await this.restPostUrl(pobj, reqUrl);
-  this.logCtl.info({
-    appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
-    appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
-    requestId: pobj.requestId || "",
-    op: "service/impl/utilsSve/utilsNeedSve.js/closeNeed",
-    content: JSON.stringify(pobj),
-    resultInfo: JSON.stringify(result),
-    optitle: "abolishIcpProgrammeByNeed推送蜂擎获取的接口信息->aliBusiness2Delivery",
-  });
+ 
   if (result.status == 0) {
     if (result.data) {
       pobj.actionBody.orderNo = result.data;
@@ -511,18 +537,19 @@ async foodCloseNeed(pobj) {
     var reqParams = {
       actionBody: {
         intentionBizId: pobj.actionBody.needNo,
-        status: "closeNeed"
+        status: "isClosed"
       },
       opType: "updateChanceStatus",
       appInfo: pobj.appInfo
     }
+    var self = this;
     self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus");
     //日志记录
     self.logCtl.info({
       appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
       appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
       requestId: pobj.requestId || "",
-      op: "service/impl/utilsSve/utilsNeedSve.js/closeNeed",
+      op: "service/impl/common/qcCenterOrderSve.js/foodCloseNeed",
       content: JSON.stringify(reqParams),
       resultInfo: "",
       optitle: "updateChanceStatus推送蜂擎获取的接口信息->aliBusiness2Delivery",