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

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

@@ -166,6 +166,7 @@ class CenterorderService extends AppServiceBase {
       orderStatus: 2
     }
     var orderrtn = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
+    console.log(orderrtn,'====================');
     if (orderrtn.status != 0) {
       if (orderrtn.status == -1) {
         return system.getResultSuccess(null, "订单已经创建");
@@ -193,6 +194,8 @@ class CenterorderService extends AppServiceBase {
     if (solutiondata.data && solutiondata.data.channelNeedNo) {
       pobj.actionBody.needId = solutiondata.data.channelNeedNo;
     }
+    pobj.actionBody.sku = data.data.service_code;
+    pobj.actionBody.appName = pobj.appInfo.app_name;
     if (solutiondata.status == 0) {
       pobj.actionBody.orderNo = pobj.actionBody.channelOrder.channelOrderNo;
       this.utilsPushSve.aliBusiness2Fq(pobj, "pushOrderBusiness");
@@ -315,6 +318,8 @@ class CenterorderService extends AppServiceBase {
         phone: pobj.actionBody.publishMobile,
         needId: solutiondata.data.channelNeedNo,
         //companyName:solutiondata.data.solutionContent.solution.CompanyName || ''
+        sku:data.data.service_code,
+        appName:pobj.appInfo.app_name
       },
       appInfo: pobj.appInfo
     }
@@ -642,6 +647,7 @@ class CenterorderService extends AppServiceBase {
     else if (pobj.actionBody.channelItemCode == 'RT') {
       pobj.actionBody.regType = "baidu.radiotv";
     }
+  
     var fqobj = {
       actionBody: {
         area: pobj.actionBody.province,
@@ -650,7 +656,10 @@ class CenterorderService extends AppServiceBase {
         orderPrice: Number(pobj.actionBody.orderPrice / 100),
         phone: pobj.actionBody.publishMobile,
         needId: solutiondata.data.channelNeedNo,
-        companyName:solutiondata.data.solutionContent.solution.CompanyName || ''
+        companyName:solutiondata.data.solutionContent.solution.CompanyName || '',
+        //2021-1-21 laolan add new 
+        appName:pobj.appInfo.app_name || '',
+        sku:data.data.service_code || ''
       },
       appInfo: pobj.appInfo
     }

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

@@ -117,8 +117,11 @@ class RegCenterOrderService extends AppServiceBase {
         phone: pobj.actionBody.publishMobile,
         needId: solutiondata.data.channelNeedNo,
         price_desc : pobj.actionBody.taxpayerType,
-        additions_desc : pobj.actionBody.companyProperties
+        additions_desc : pobj.actionBody.companyProperties,
         // companyName:solutiondata.data.solutionContent.CompanyName || ''
+        //2021-1-21 laolan add new 
+        appName:pobj.appInfo.app_name || '',
+        sku:data.data.service_code || ''
       },
       appInfo: pobj.appInfo
     }
@@ -218,8 +221,9 @@ class RegCenterOrderService extends AppServiceBase {
   }
   var data = JSON.parse(rtn.stdout);
   if (data.status != 0) {
-    return system.getResultFail(-5015, "需求類型查询失败");
+    return system.getResultFail(-5016, "需求類型查询失败");
   }
+
   pobj.actionBody.type_code = data.data.type_code;
   pobj.actionBody.type_name = data.data.type_name;
   pobj.actionBody.channel_type_code = data.data.channel_type_code;
@@ -256,6 +260,8 @@ class RegCenterOrderService extends AppServiceBase {
       pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
       pobj.actionBody.idempotentSource = pobj.actionBody.type;
       pobj.actionBody.customerName = pobj.actionBody.userName;
+      //2021-1-21 laolan add new 
+      pobj.actionBody.appName = pobj.appInfo.app_name || '',
       this.utilsPushSve.baiduBusiness2Fq(pobj, "pushNeedICPBusinessNew");
   }
   return result;

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

@@ -56,7 +56,9 @@ class UtilsFqAliyunService extends AppServiceBase {
       pay_flow_no: orderInfo.pay_flow_no,// 支付流水号
       pay_channel: orderInfo.pay_channel,// 支付渠道(微信、支付宝)(必填)
       pay_time: orderInfo.pay_time,//付款时间
-      pay_payer_bank_no: orderInfo.pay_payer_bank_no//付款人账号
+      pay_payer_bank_no: orderInfo.pay_payer_bank_no,//付款人账号
+      sku:productInfo.price_item.service_code,
+      appName:pobj.appInfo.app_name
     };
     // var result = await this.opAliyunClientPost(pobj, "pushOrderBusiness", interface_params_info.opUrl, interface_params_info.key, interface_params_info.secret, params);
     var result = await this.opAliyunClientPost(pobj, interface_params_info.opUrl, interface_params_info.key, interface_params_info.secret, params);

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

@@ -50,6 +50,7 @@ class UtilsNeedService extends AppServiceBase {
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     pobj.actionBody.channel_type_name = data.data.channel_type_name;
     pobj.actionBody.type = pobj.actionBody.channel_type_code;
+    pobj.actionType.appName = pobj.appInfo.app_name;
     if (pobj.actionBody.channel_type_code == 5) {
       pobj.actionBody.type = "ali.icp";
     } else if (pobj.actionBody.channel_type_code == 7) {
@@ -1231,7 +1232,9 @@ class UtilsNeedService extends AppServiceBase {
             orderPrice: Number(pobj.actionBody.orderPrice / 100),
             phone: needInfoResult.data.publishMobile,
             needId: solutiondata.data.channelNeedNo,
-            companyName: solutiondata.data.solutionContent.solution.CompanyName || ''//1
+            companyName: solutiondata.data.solutionContent.solution.CompanyName || '',//1
+            sku:productPriceResult.data.service_code,
+            appName:pobj.appInfo.app_name
           },
           appInfo: pobj.appInfo
         }
@@ -1446,6 +1449,8 @@ class UtilsNeedService extends AppServiceBase {
         pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
         pobj.actionBody.idempotentSource = pobj.actionBody.type;
         pobj.actionBody.customerName = pobj.actionBody.userName;
+        //2021-1-21 laolan add new 
+        pobj.actionBody.appName = pobj.appInfo.app_name || '',
         this.utilsPushSve.baiduBusiness2Fq(pobj, "pushNeedICPBusinessNew");
       }
     }

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

@@ -57,6 +57,7 @@ class UtilsNeedService2 extends AppServiceBase {
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     pobj.actionBody.channel_type_name = data.data.channel_type_name;
     pobj.actionBody.type = pobj.actionBody.channel_type_code;
+    pobj.actionBody.appName = pobj.appInfo.app_name;
     if (pobj.actionBody.channel_type_code == 5) {
       pobj.actionBody.type = "ali.icp";
     } else if (pobj.actionBody.channel_type_code == 7) {
@@ -149,6 +150,8 @@ class UtilsNeedService2 extends AppServiceBase {
     pobj.actionBody.type_name = data.data.type_name;
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     pobj.actionBody.channel_type_name = data.data.channel_type_name;
+    pobj.actionBody.appName = pobj.appInfo.app_name;
+    pobj.actionBody.sku = data.data.service_code;
     pobj.actionType = "submitNeedH5";
     var reqUrl = this.centerOrderUrl + "action/need/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
@@ -1220,7 +1223,9 @@ class UtilsNeedService2 extends AppServiceBase {
             orderPrice: Number(pobj.actionBody.orderPrice / 100),
             phone: needInfoResult.data.publishMobile,
             needId: solutiondata.data.channelNeedNo,
-            companyName: solutiondata.data.solutionContent.solution.CompanyName || ''//1
+            companyName: solutiondata.data.solutionContent.solution.CompanyName || '',//1
+            appName:pobj.appInfo.app_name,
+            sku:productPriceResult.data.service_code
           },
           appInfo: pobj.appInfo
         }
@@ -1387,6 +1392,7 @@ class UtilsNeedService2 extends AppServiceBase {
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     pobj.actionBody.channel_type_name = data.data.channel_type_name;
     pobj.actionBody.type = pobj.actionBody.channel_type_code;
+    pobj.actionBody.appName = pobj.appInfo.app_name;
     if (pobj.actionBody.channel_type_code == 5) {
       pobj.actionBody.type = "baidu.icp";
     } else if (pobj.actionBody.channel_type_code == 7) {

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

@@ -36,6 +36,7 @@ class UtilsOpNeedService extends AppServiceBase {
       pobj.actionBody.type_name = opResult.data.type_name;
       pobj.actionBody.channel_type_code = opResult.data.channel_type_code;
       pobj.actionBody.channel_type_name = opResult.data.channel_type_name;
+      pobj.actionBody.appName = pobj.appInfo.app_name;
     }
     // 提交需求 暂未做推送
     pobj.actionType = "opSubmitNeed";