Merge branch 'fqboss' of gitlab.gongsibao.com:jiangyong/zhichan into fqboss

fqboss/app/base/api/impl/tmsub.js

@@ -545,5 +545,22 @@ class TmSub {
     }
   }
   //**********批量更新支付状态---结束 */
+
+  //根据渠道订单号获取申请人信息（渠道订单号非渠道交付单号）
+  async getApplyNameByChannelOrderNo(pobj){
+    try {
+      var result = await this.trademarkS.getApplyNameByChannelOrderNo(pobj);
+      return result;
+    } catch (e) {
+      //日志记录
+      logCtl.error({
+        optitle: "根据渠道订单号获取申请人信息异常---error",
+        op: "base/api/impl/tmsub/getApplyNameByChannelOrderNo",
+        content: e.stack,
+        clientIp: ""
+      });
+      return {code:-200,err:e.stack};
+    }
+  }
 }
 module.exports = TmSub;

fqboss/app/base/service/impl/trademarkSve.js

@@ -1153,7 +1153,7 @@ class TrademarkService extends ServiceBase {
         serviceOrderNo: item.channelOrderNum,
         reqOnlyCode: item.reqOnlyCode,
         PrincipalName: principalName,
-        TmNameType: tmNameType,
+        // TmNameType: tmNameType,//TODO:暂时先不上，等阿里那边优化后在放开此参数
       };
       var submitTm = await rc.post("SaveTradeMarkProductSolution", subParam);
       //返回值
@@ -1634,7 +1634,20 @@ class TrademarkService extends ServiceBase {
   }
 
   //----------------------------------1688商标状态修改 结束----------------------------------------------------------------
-
+  async getApplyNameByChannelOrderNo(pobj){
+    if(!pobj || !pobj.channelOrderNo){
+      return {code:-100,msg:"channelOrderNo is empty!"}
+    }
+    var tm = await this.dao.model.findOne({
+      where: {channelOrderListInfo:{[this.db.Op.like]:"%" + pobj.channelOrderNo + "%" }},
+      attributes:["applyName"],
+      raw:true
+    });
+    if(tm && tm.applyName){
+      return {code:1,data:tm.applyName}
+    }
+    return {code:-101,msg:"未知申请人"};
+  }
 }
 module.exports = TrademarkService;
 // var task = new TrademarkService();