tj

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

@@ -489,11 +489,11 @@ class UtilsOrderService extends AppServiceBase {
       //   productId: outTradeInfo.length == 3 ? outTradeInfo[2] : 0
       //   productId: outTradeInfo.length == 3 ? outTradeInfo[2] : 0
       //  }
       //  }
       // opResult.data = {
       // opResult.data = {
-      //   orderNo: "TM36202004142002tEl6",
+      //   orderNo: "TM36202004150927UPmE",
       //   uappId: 36,
       //   uappId: 36,
       //   productId: 42
       //   productId: 42
       // };
       // };
-      //获取充值业务锁
+      // //获取充值业务锁
       // await this.cacheManager["TlPayLocker"].init(opResult.data.orderNo);//---测试时放开
       // await this.cacheManager["TlPayLocker"].init(opResult.data.orderNo);//---测试时放开
       var locker = await this.cacheManager["TlPayLocker"].enter(opResult.data.orderNo);
       var locker = await this.cacheManager["TlPayLocker"].enter(opResult.data.orderNo);
       if (!locker || locker != "1") {
       if (!locker || locker != "1") {

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

@@ -255,7 +255,7 @@ class UtilsTmAliyunService extends AppServiceBase {
     }
     }
     var params = {
     var params = {
       action: "BindApplicant",
       action: "BindApplicant",
-      reqbody: { ApplicantId: applicantId, AuthorizationOssKey: authorizationOssKey },
+      reqbody: { ApplicantId: applicantId, AuthorizationOssKey: authorizationOssKey,BizId:"trademark_register-cn-4591lzry16c" },
       rpcParam: rpcParam
       rpcParam: rpcParam
     }
     }
     //TODO:BizId-----报 BizId is mandatory for this action－－BizId是此操作的强制命令
     //TODO:BizId-----报 BizId is mandatory for this action－－BizId是此操作的强制命令
@@ -376,9 +376,6 @@ 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渠道商标交付失败", 3);
-    }
     return result;
     return result;
   }
   }
   async updateAliChannelTm(pobj) {//修改ali渠道商标信息
   async updateAliChannelTm(pobj) {//修改ali渠道商标信息