aaa

igirl-channel/app/base/service/impl/dborder/customerinfoSve.js

@@ -6,6 +6,7 @@ class CustomerInfoService extends ServiceBase {
   constructor() {
   constructor() {
     super("dborder", ServiceBase.getDaoName(CustomerInfoService));
     super("dborder", ServiceBase.getDaoName(CustomerInfoService));
     this.ordertmproductSve = system.getObject("service.dborder.ordertmproductSve");
     this.ordertmproductSve = system.getObject("service.dborder.ordertmproductSve");
+    this.trademarkDao = system.getObject("db.dbtrademark.trademarkDao");
   }
   }
   /**
   /**
    * 修改申请人信息（订单详情页面使用）
    * 修改申请人信息（订单详情页面使用）
@@ -90,6 +91,17 @@ class CustomerInfoService extends ServiceBase {
         ciObj["identityCardPdf"]=obj.identityCardPdf;
         ciObj["identityCardPdf"]=obj.identityCardPdf;
       }
       }
       await self.dao.update(ciObj,t);//修改申请人信息
       await self.dao.update(ciObj,t);//修改申请人信息
+      var customerinfo2 = await self.dao.model.findOne({
+        where:{
+          id:customerinfo.id
+        },
+        raw:true
+      });
+      if(ordertmproduct.gzwtsUrl && customerinfo2.businessLicensePdf && customerinfo2.identityCardPdf){
+        // otpObj["deliveryStatus"]="dsh";
+        await self.ordertmproductSve.update({id:ordertmproduct.id,deliveryStatus:"dsh"},t);
+        await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t});
+      }
       return system.getResultSuccess();
       return system.getResultSuccess();
     })
     })
   }
   }
@@ -157,6 +169,12 @@ class CustomerInfoService extends ServiceBase {
       }
       }
 
 
       await self.dao.update(ciObj,t);//申请人信息 修改营业执照、身份证文件
       await self.dao.update(ciObj,t);//申请人信息 修改营业执照、身份证文件
+      var customerinfo2 = await self.dao.model.findOne({
+        where:{
+          id:customerinfo.id
+        },
+        raw:true
+      });
       var otpObj={
       var otpObj={
         id:ordertmproduct.id,
         id:ordertmproduct.id,
         updateuser_id:user.id,
         updateuser_id:user.id,
@@ -168,6 +186,11 @@ class CustomerInfoService extends ServiceBase {
       if(obj.smwjUrl){
       if(obj.smwjUrl){
         otpObj["smwjUrl"]=obj.smwjUrl;
         otpObj["smwjUrl"]=obj.smwjUrl;
       }
       }
+      if((ordertmproduct.gzwtsUrl || otpObj["gzwtsUrl"]) && customerinfo2.businessLicensePdf && customerinfo2.identityCardPdf){
+        otpObj["deliveryStatus"]="dsh";
+        await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t});
+      
+      }
       await self.ordertmproductSve.update(otpObj,t);//商标交付单 修改盖章委托书、说明文件
       await self.ordertmproductSve.update(otpObj,t);//商标交付单 修改盖章委托书、说明文件
       return system.getResultSuccess();
       return system.getResultSuccess();
     })
     })

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

@@ -309,10 +309,16 @@ class TradeMarkService extends ServiceBase {
     }
     }
     return await self.db.transaction(async function (t) {
     return await self.db.transaction(async function (t) {
       var tmObj={id:tm.id};
       var tmObj={id:tm.id};
+      var otp = {id:ordertmproduct.id};
       if(obj.tmStatus){
       if(obj.tmStatus){
         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,ddj,ydj,ywc,".indexOf(tmObj.officialType)>=0){
+          otp["deliveryStatus"]=tmObj.officialType;
+          await self.ordertmproductSve.update(otp,t);
+        }
+         // {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
       }
       }
       if(obj.opNotes){
       if(obj.opNotes){
         tmObj["opNotes"]=obj.opNotes;
         tmObj["opNotes"]=obj.opNotes;