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

center-channel/app/base/api/impl/ic/consultation.js

@@ -9,8 +9,8 @@ class Consultation extends APIBase {
         this.gatewaypushlogSve = system.getObject("service.common.gatewaypushlogSve");
         this.gatewaypushlogSve = system.getObject("service.common.gatewaypushlogSve");
     }
     }
 
 
-    async submit(pobj,req) {
-        if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){
+    async submit(pobj, req) {
+        if (!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret) {
             return regCfg.getResultFail("未知应用或应用未启用");
             return regCfg.getResultFail("未知应用或应用未启用");
         }
         }
         if (!pobj.intentionBizId) {
         if (!pobj.intentionBizId) {
@@ -22,7 +22,7 @@ class Consultation extends APIBase {
         if (!pobj.consultType) {
         if (!pobj.consultType) {
             return regCfg.getResultFail("consultType不能为空");
             return regCfg.getResultFail("consultType不能为空");
         }
         }
-        pobj.type = pobj.consultType;
+        pobj.type = pobj.consultType;// 这里在channel getProductTypeInfo 用到
         // pobj.mobile = pobj.phone;//百度公司注册提交需求根据geteway中regCenterOrderSve文件reqcenterchannel2方法判断隐藏mobile字段
         // pobj.mobile = pobj.phone;//百度公司注册提交需求根据geteway中regCenterOrderSve文件reqcenterchannel2方法判断隐藏mobile字段
         pobj.action_type = "submitRegNeed";
         pobj.action_type = "submitRegNeed";
         if (pobj.area) {
         if (pobj.area) {

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

@@ -225,6 +225,12 @@ class RegCenterOrderService extends AppServiceBase {
         if (pobj.actionBody.channel_type_code) {
         if (pobj.actionBody.channel_type_code) {
             pobj.actionBody.type = regCfg.channelTypeCode[pobj.actionBody.channel_type_code]
             pobj.actionBody.type = regCfg.channelTypeCode[pobj.actionBody.channel_type_code]
             pobj.actionBody.idempotentSource = "baidu_gsreg";
             pobj.actionBody.idempotentSource = "baidu_gsreg";
+            if(pobj.actionBody.channel_type_code=='QYJYTC1'){
+                pobj.actionBody.idempotentSource = "baidu_qyjytc1";
+            }
+            if(pobj.actionBody.channel_type_code=='QYJYTC2'){
+                pobj.actionBody.idempotentSource = "baidu_qyjytc2";
+            }
         }
         }
         if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
         if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
             pobj.actionBody.level = "A";
             pobj.actionBody.level = "A";