修改状态对应关系

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"
@@ -327,7 +327,7 @@ class TradeMarkService extends ServiceBase {
         if (self.statusConvertJSON[obj.tmStatus]) {
         if (self.statusConvertJSON[obj.tmStatus]) {
           tmObj["officialType"] = self.statusConvertJSON[obj.tmStatus];
           tmObj["officialType"] = self.statusConvertJSON[obj.tmStatus];
         }
         }
-        if (tmObj.officialType && ",dqrfa,dsccl,dsh,ydj,ywc,".indexOf(tmObj.officialType) >= 0) {
+        if (tmObj.officialType && ",dqrfa,dsccl,dsh,ddj,ydj,ywc,".indexOf(tmObj.officialType) >= 0) {
           otp["deliveryStatus"] = tmObj.officialType;
           otp["deliveryStatus"] = tmObj.officialType;
           await self.ordertmproductSve.update(otp, t);
           await self.ordertmproductSve.update(otp, t);
         }
         }