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/orderSve.js

@@ -1742,6 +1742,7 @@ class OrderService extends ServiceBase {
   async updateInsideOrderDetailByOrderNum(obj, onlyCode) {
     // console.log("商标自动提报专用#####################");
     var self = this;
+    var result = {code:-1745,msg:"修改失败"};
     var channelorder = obj.channelorder;
     var user = obj.user;
     var app = obj.app;

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

@@ -1590,7 +1590,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();

fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.js

@@ -937,7 +937,7 @@
           identityCard: this.apply.identityCard, applyAddr: this.apply.applyAddr, businessLicensePic: this.apply.businessLicensePic,
           identityCardPic: this.apply.identityCardPic, remark: this.form.remark, mobile: this.apply.mobile,
           businessLicensePic2: this.apply.businessLicensePic2,
-          identityCardPic2: this.apply.identityCardPic2
+          identityCardPic2: this.apply.identityCardPic2, principal: this.apply.principal
         };
         var customer = {
           orderNum: this.order.orderNum, zipCode: this.apply.zipCode || "100000", customerContact: this.apply.customerContact, mobile: this.apply.mobile,