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

center-channel/app/base/api/impl/opreceive/need.js

@@ -124,6 +124,9 @@ class Need extends APIBase {
                 // break;
                 // break;
                 break;
                 break;
             //-----------接入百度ICP------end----------------------------------
             //-----------接入百度ICP------end----------------------------------
+            case "exportNeeds":
+                opResult = await this.utilsNeedSve.exportNeeds(pobj,req);
+                break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

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

@@ -648,6 +648,13 @@ class CenterorderService extends AppServiceBase {
       pobj.actionBody.regType = "baidu.radiotv";
       pobj.actionBody.regType = "baidu.radiotv";
     }
     }
   
   
+    if(pobj && pobj.appInfo && pobj.appInfo.uapp_id && pobj.appInfo.uapp_id=='52'){
+      if (pobj.actionBody.channelItemCode == '5') {
+        pobj.actionBody.regType = "ename.icp";
+      } else if (pobj.actionBody.channelItemCode == '7') {
+        pobj.actionBody.regType = "ename.edi";
+      }
+    }
     var fqobj = {
     var fqobj = {
       actionBody: {
       actionBody: {
         area: pobj.actionBody.province,
         area: pobj.actionBody.province,

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

@@ -115,7 +115,7 @@ class SignService{
 }
 }
 module.exports = SignService;
 module.exports = SignService;
 
 
-// var task = new SignService();
+var task = new SignService();
 // var obj = {
 // var obj = {
 //   "actionType": "serviceProviderSubmitMaterial",
 //   "actionType": "serviceProviderSubmitMaterial",
 //     "actionBody": {
 //     "actionBody": {
@@ -177,9 +177,9 @@ module.exports = SignService;
 
 
 // }
 // }
 // var obj={
 // var obj={
-//   "bizId": "biz_ename_1614061894_test",
+//   "bizId": "yiming_solution_test_0001",
 //   "isDirectBuy": 0,
 //   "isDirectBuy": 0,
-//   "orderNo": "trade_ename_1614061894_test",
+//   "orderNo": "yiming_order_test_0001",
 //   "phone": "18506015665",
 //   "phone": "18506015665",
 //   "userName": "张三",
 //   "userName": "张三",
 //   "companyName": "测试有限公司2",
 //   "companyName": "测试有限公司2",

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

@@ -1433,6 +1433,16 @@ class UtilsNeedService extends AppServiceBase {
       pobj.actionBody.type = "baidu.radiotv";
       pobj.actionBody.type = "baidu.radiotv";
       pobj.actionBody.idempotentSource = "baidu_radiotv";
       pobj.actionBody.idempotentSource = "baidu_radiotv";
     }
     }
+
+    if(pobj.appInfo && pobj.appInfo.uapp_id && pobj.appInfo.uapp_id=="52"){
+      if (pobj.actionBody.channel_type_code == 5) {
+        pobj.actionBody.type = "ename.icp";
+        pobj.actionBody.idempotentSource = "ename_icp";
+      } else if (pobj.actionBody.channel_type_code == 7) {
+        pobj.actionBody.type = "ename.edi";
+        pobj.actionBody.idempotentSource = "ename_edi";
+      } 
+    }
     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";
     } else {
     } else {
@@ -1570,6 +1580,25 @@ class UtilsNeedService extends AppServiceBase {
     return rtn;
     return rtn;
   }
   }
   //-----------接入百度ICP------end----------------------------------
   //-----------接入百度ICP------end----------------------------------
+
+  async exportNeeds(pobj,req){
+    let url = this.centerOrderUrl + 'action/need/springBoard';
+    if(!pobj.actionBody.needsArr){
+      return system.getResultFail(-1,'导入数据不能为空');
+    }
+    if(!pobj.actionBody.uapp_id){
+      return system.getResultFail(-1,'渠道id 不能为空');
+    }
+    pobj.actionType = 'bulkCreateNeeds';
+    let result = await this.execPostByTimeOut(req,pobj,url,"json",null,60);
+    if (!result || result.status != 0) {
+      return system.getResult(null, result.msg);
+    }
+    if (!result.data || result.data.status != 0) {
+      return system.getResult(null, result.data.msg);
+    }
+    return result.data.data;
+  }
 }
 }
 
 
 module.exports = UtilsNeedService;
 module.exports = UtilsNeedService;