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

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

@@ -59,7 +59,7 @@ 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
+        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

@@ -362,7 +362,7 @@ class UtilsNeedService extends AppServiceBase {
       }
       }
       actionBody.newuserOtherList = newuserOtherList;
       actionBody.newuserOtherList = newuserOtherList;
     }
     }
-    if (actionBody.isDirectBuy&&(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";

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

@@ -933,7 +933,7 @@ class UtilsOrderService extends AppServiceBase {
       };
       };
       opOrderResult.data.orderNo = params.orderNo;
       opOrderResult.data.orderNo = params.orderNo;
       opOrderResult.data.order_info.pay_flow_no = params.trade_no || "";// 2020 0704 lin 新增 推送fq必填字段
       opOrderResult.data.order_info.pay_flow_no = params.trade_no || "";// 2020 0704 lin 新增 推送fq必填字段
-      opOrderResult.data.order_info.pay_channel = params.payType == 'wx' ? '微信' : '支付宝';//付款方式
+      opOrderResult.data.order_info.pay_channel = params.payType ||"";//付款方式
       opOrderResult.data.order_info.pay_time = params.payTime;//付款时间
       opOrderResult.data.order_info.pay_time = params.payTime;//付款时间
       opOrderResult.data.order_info.pay_payer_bank_no = params.buyer_email || "";//付款账号
       opOrderResult.data.order_info.pay_payer_bank_no = params.buyer_email || "";//付款账号
       opOrderResult.data.order_contact = opOrderResult.data.delivery_content.orderContact;
       opOrderResult.data.order_contact = opOrderResult.data.delivery_content.orderContact;