Merge remote-tracking branch 'origin/center-channel' into center-channel

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

@@ -424,7 +424,7 @@ class UtilsNeedService extends AppServiceBase {
       }
       }
       self.utilsPushSve.business2Channel(reqParams, "updateChanceStatus");
       self.utilsPushSve.business2Channel(reqParams, "updateChanceStatus");
       self.utilsPushSve.business2Channel(pobj, "pushCloseICPNeed");
       self.utilsPushSve.business2Channel(pobj, "pushCloseICPNeed");
-    } 
+    }
     return result;
     return result;
   }
   }
 
 
@@ -525,6 +525,9 @@ class UtilsNeedService extends AppServiceBase {
       if (!actionBody.status) {
       if (!actionBody.status) {
         return system.getResult(null, "actionBody.status can not be empty，100495");
         return system.getResult(null, "actionBody.status can not be empty，100495");
       }
       }
+      if (actionBody.status == 3) {//3为资料未确认(暂时不用做处理)
+        return system.getResultSuccess();
+      }
       if (actionBody.businessLicense) {
       if (actionBody.businessLicense) {
         actionBody.newbusinessLicense = await self.opDownFileInfo(actionBody.businessLicense);
         actionBody.newbusinessLicense = await self.opDownFileInfo(actionBody.businessLicense);
       }
       }
@@ -875,7 +878,7 @@ class UtilsNeedService extends AppServiceBase {
     var spobj = [];
     var spobj = [];
     // 遍历生成阿里需求 并把bizId 填充进数组
     // 遍历生成阿里需求 并把bizId 填充进数组
     for (var i = 0; i < actionBody.demands.length; i++) {
     for (var i = 0; i < actionBody.demands.length; i++) {
-      // 第一步 
+      // 第一步
       // 地区转换
       // 地区转换
       var area = this.areaChange(actionBody.demands[i].area)
       var area = this.areaChange(actionBody.demands[i].area)
       // SubmitIcpIntention需要的类型转换ICP许可证 = 5/EDI许可证 = 7
       // SubmitIcpIntention需要的类型转换ICP许可证 = 5/EDI许可证 = 7
@@ -935,7 +938,7 @@ class UtilsNeedService extends AppServiceBase {
       obj1.actionBody = npobj[i];
       obj1.actionBody = npobj[i];
       var opResult = await this.submitNeed(obj1, obj1.actionBody);
       var opResult = await this.submitNeed(obj1, obj1.actionBody);
       console.log("needBatchUpload-opResult", opResult)
       console.log("needBatchUpload-opResult", opResult)
-      // 第三步 
+      // 第三步
       // 提交Icp注册方案
       // 提交Icp注册方案
       // 程序执行比异步分配需求快，所以写成两个循环
       // 程序执行比异步分配需求快，所以写成两个循环
       var objString2 = JSON.stringify(pobj);
       var objString2 = JSON.stringify(pobj);
@@ -1569,7 +1572,7 @@ class UtilsNeedService extends AppServiceBase {
       } else if (pobj.actionBody.channel_type_code == "edinb") {
       } else if (pobj.actionBody.channel_type_code == "edinb") {
         pobj.actionBody.type = "yiming.edinb";
         pobj.actionBody.type = "yiming.edinb";
         pobj.actionBody.idempotentSource = "yiming.edinb";
         pobj.actionBody.idempotentSource = "yiming.edinb";
-      } 
+      }
     }
     }
     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";