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

igirl-channel/app/base/service/impl/dbtrademark/trademarkSve.js

@@ -26,12 +26,12 @@ class TradeMarkService extends ServiceBase {
       "READY": "dsccl",
       "READY": "dsccl",
       "DOCFINISH": "dsh",
       "DOCFINISH": "dsh",
       "AWAITCHECK": "dsh",
       "AWAITCHECK": "dsh",
-      "WAITCOMMIT": "ddj",
+      "WAITCOMMIT": "ddj",//待递交
       "COMMITED": "ydj",
       "COMMITED": "ydj",
       "ROBOT": "ydj",
       "ROBOT": "ydj",
       "ROBOTPAY": "ydj",
       "ROBOTPAY": "ydj",
       "RECVCOMMIT": "ydj",
       "RECVCOMMIT": "ydj",
-      "FILLEXCEPTION": "shbtg",
+      "FILLEXCEPTION": "dsh",//审核不通过或填报异常，对应交付状态是待审核--->dsh
       //1688
       //1688
       "WAITCONFIRM": "dqrfa",
       "WAITCONFIRM": "dqrfa",
       "CONFIRMFAIL": "dqrfa"
       "CONFIRMFAIL": "dqrfa"
@@ -64,7 +64,7 @@ class TradeMarkService extends ServiceBase {
     }
     }
     // 1.获取交付单信息
     // 1.获取交付单信息
     var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
     var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
-      where: { deliveryOrderNo: deliveryOrderNo,app_id:app.id },
+      where: { deliveryOrderNo: deliveryOrderNo, app_id: app.id },
       raw: true
       raw: true
     });
     });
     if (!ordertmproduct || !ordertmproduct.id) {
     if (!ordertmproduct || !ordertmproduct.id) {
@@ -133,7 +133,7 @@ class TradeMarkService extends ServiceBase {
     }
     }
     // 1.获取交付单信息
     // 1.获取交付单信息
     var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
     var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
-      where: { deliveryOrderNo: deliveryOrderNo,app_id:app.id },
+      where: { deliveryOrderNo: deliveryOrderNo, app_id: app.id },
       raw: true
       raw: true
     });
     });
     if (!ordertmproduct || !ordertmproduct.id) {
     if (!ordertmproduct || !ordertmproduct.id) {
@@ -331,7 +331,7 @@ class TradeMarkService extends ServiceBase {
           otp["deliveryStatus"] = tmObj.officialType;
           otp["deliveryStatus"] = tmObj.officialType;
           await self.ordertmproductSve.update(otp, t);
           await self.ordertmproductSve.update(otp, t);
         }
         }
-        // {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
+        // {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ydj": "已递交", "ywc": "已完成" },
       }
       }
       if (obj.opNotes) {
       if (obj.opNotes) {
         tmObj["opNotes"] = obj.opNotes;
         tmObj["opNotes"] = obj.opNotes;
@@ -339,10 +339,10 @@ class TradeMarkService extends ServiceBase {
       if (obj.submitTime) {
       if (obj.submitTime) {
         tmObj["submitTime"] = obj.submitTime;
         tmObj["submitTime"] = obj.submitTime;
       }
       }
-      if(obj.tmRegistNum){
-        tmObj["tmRegistNum"]=obj.tmRegistNum;
+      if (obj.tmRegistNum) {
+        tmObj["tmRegistNum"] = obj.tmRegistNum;
       }
       }
-      await self.dao.update(tmObj,t);//修改商标状态信息
+      await self.dao.update(tmObj, t);//修改商标状态信息
       var deliveryStatusName = uiconfig.config.pdict.official_type[tmObj.officialType];
       var deliveryStatusName = uiconfig.config.pdict.official_type[tmObj.officialType];
       var flowObj = {
       var flowObj = {
         isShow: 1,
         isShow: 1,