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

.gitignore

-node_modules/
+node_modules/
\ No newline at end of file
+.idea
+.history/
\ No newline at end of file

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

@@ -137,7 +137,7 @@ class UtilsNeedService extends AppServiceBase {
     }
     }
     var rtn = await this.execClient.execPost(pobj, url);
     var rtn = await this.execClient.execPost(pobj, url);
     var data = JSON.parse(rtn.stdout);
     var data = JSON.parse(rtn.stdout);
-    if (data.data.channelTypeCode == 1||data.data.channelTypeCode == 2) {//商标
+    if (data.data && (data.data.channelTypeCode == 1||data.data.channelTypeCode == 2)) {//商标
       this.execPostUrl({
       this.execPostUrl({
         "actionProcess": "AliTm",
         "actionProcess": "AliTm",
         "appCode": "100099",
         "appCode": "100099",
@@ -388,6 +388,7 @@ class UtilsNeedService extends AppServiceBase {
     if (!actionBody.bizId) {
     if (!actionBody.bizId) {
       return system.getResult(null, "actionBody.bizId can not be empty，100495");
       return system.getResult(null, "actionBody.bizId can not be empty，100495");
     }
     }
+    actionBody.BizId = actionBody.bizId;
     let isTM = actionBody.bizId.startsWith("TM_")
     let isTM = actionBody.bizId.startsWith("TM_")
     if (isTM){//商标
     if (isTM){//商标
       let result = await this.getSolutionByChannelSolutionNo(pobj, pobj.actionBody);
       let result = await this.getSolutionByChannelSolutionNo(pobj, pobj.actionBody);
@@ -401,7 +402,6 @@ class UtilsNeedService extends AppServiceBase {
         actionBody.fileUrl = await self.opDownFileInfo(actionBody.fileUrl);
         actionBody.fileUrl = await self.opDownFileInfo(actionBody.fileUrl);
       }
       }
     }else {
     }else {
-      actionBody.BizId = actionBody.bizId;
       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");
       }
       }
@@ -451,7 +451,8 @@ class UtilsNeedService extends AppServiceBase {
          this.utilsPushSve.aliBusiness2Fq(pobj, "pushTMpayRefund");
          this.utilsPushSve.aliBusiness2Fq(pobj, "pushTMpayRefund");
       }
       }
       //通知fqboss
       //通知fqboss
-      this.execPostUrl({ "actionProcess": "AliTm", "appCode": "100099", "sign": await this.getFQbossSign(actionBody), actionBody },settings.fqbossTmUrl())
+      let pushres = await this.execPostUrl({ "actionProcess": "AliTm", "appCode": "100099", "sign": await this.getFQbossSign(actionBody), actionBody },settings.fqbossTmUrl())
+      console.log("推送fqboos----->",pushres)
     }else {
     }else {
       if (actionBody.status == 2) {
       if (actionBody.status == 2) {
         var deliveryObj = {
         var deliveryObj = {

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

@@ -543,9 +543,9 @@ class UtilsTmAliyunService extends AppServiceBase {
     }
     }
     var reqUrl = settings.centerOrderUrl() + "opaction/opOrder/springBoard";
     var reqUrl = settings.centerOrderUrl() + "opaction/opOrder/springBoard";
     var result = await this.restPostUrl(tmpPobj, reqUrl);
     var result = await this.restPostUrl(tmpPobj, reqUrl);
-    if (result.status != 0) {
-      return await this.disposePushResultFail(tmpPobj, result, "ali->tmCreateApplicant->addChannelTmApplicantResult->新增ali渠道商标交付信息失败", this.pushlogFailType.FAILLOG);
-    }
+    // if (result.status != 0) {
+    //   return await this.disposePushResultFail(tmpPobj, result, "ali->tmCreateApplicant->addChannelTmApplicantResult->新增ali渠道商标交付信息失败", this.pushlogFailType.FAILLOG);
+    // }
     return result;
     return result;
   }
   }
   async updateAliChannelTmApplicant(pobj, actionBody) {//新增ali渠道商标交付信息
   async updateAliChannelTmApplicant(pobj, actionBody) {//新增ali渠道商标交付信息
@@ -556,9 +556,9 @@ class UtilsTmAliyunService extends AppServiceBase {
     }
     }
     var reqUrl = settings.centerOrderUrl() + "opaction/opOrder/springBoard";
     var reqUrl = settings.centerOrderUrl() + "opaction/opOrder/springBoard";
     var result = await this.restPostUrl(tmpPobj, reqUrl);
     var result = await this.restPostUrl(tmpPobj, reqUrl);
-    if (result.status != 0) {
-      return await this.disposePushResultFail(tmpPobj, result, "ali->tmCreateApplicant->addChannelTmApplicantResult->新增ali渠道商标交付信息失败", this.pushlogFailType.FAILLOG);
-    }
+    // if (result.status != 0) {
+    //   return await this.disposePushResultFail(tmpPobj, result, "ali->tmCreateApplicant->addChannelTmApplicantResult->新增ali渠道商标交付信息失败", this.pushlogFailType.FAILLOG);
+    // }
     return result;
     return result;
   }
   }
   async getAliChannelTmDelivery(pobj) {//查询ali渠道商标交付信息
   async getAliChannelTmDelivery(pobj) {//查询ali渠道商标交付信息