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

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

@@ -60,7 +60,8 @@ class QcCenterOrderService extends AppServiceBase {
         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,
         Area: solution.Area, Note: solution.Note,
-        //ActionType:solution.ActionType
+        ActionType:solution.ActionType,
+        Source:"官网"
       };
       };
       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);

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

@@ -944,10 +944,9 @@ class UtilsOrderService extends AppServiceBase {
       }
       }
 
 
       // 推送
       // 推送
+      this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
       if(['icpsq','edisq'].includes(opOrderResult.data.product_info.channel_item_code)){
       if(['icpsq','edisq'].includes(opOrderResult.data.product_info.channel_item_code)){
         this.utilsPushSve.aliBusiness2Delivery(pobj, "pushDeliveryOrder");
         this.utilsPushSve.aliBusiness2Delivery(pobj, "pushDeliveryOrder");
-      }else{
-        this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
       }
       }
       opOrderResult.data = null;
       opOrderResult.data = null;
       return opOrderResult;
       return opOrderResult;