Merge remote-tracking branch 'origin/center-channel' into center-channel

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

@@ -59,7 +59,8 @@ class QcCenterOrderService extends AppServiceBase {
       var pushObj = {
       var pushObj = {
         IntentionBizId: needinfo.channelNeedNo,
         IntentionBizId: needinfo.channelNeedNo,
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
-        Area: solution.Area, Note: solution.Note, ActionType:solution.ActionType
+        Area: solution.Area, Note: solution.Note,
+        //ActionType:solution.ActionType
       };
       };
       if (needsolution.channelSolutionNo) {
       if (needsolution.channelSolutionNo) {
         pushObj["BizId"] = needsolution.channelSolutionNo;
         pushObj["BizId"] = needsolution.channelSolutionNo;

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

@@ -361,9 +361,9 @@ class UtilsNeedService extends AppServiceBase {
       }
       }
       actionBody.newuserOtherList = newuserOtherList;
       actionBody.newuserOtherList = newuserOtherList;
     }
     }
-    if (actionBody.isDirectBuy === "true"&&(actionBody.status == 1||actionBody.status == 0)) {//已支付直购不调用
+    /*if (actionBody.isDirectBuy === "true"&&(actionBody.status == 1||actionBody.status == 0)) {//已支付直购不调用
       return system.getResultSuccess();
       return system.getResultSuccess();
-    }
+    }*/
     pobj.actionType = "receiveIcpStatusNotify";
     pobj.actionType = "receiveIcpStatusNotify";
     var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
     var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
     var rtn = await this.restPostUrl(pobj, url);
     var rtn = await this.restPostUrl(pobj, url);