aaa

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

@@ -99,7 +99,9 @@ class CustomerInfoService extends ServiceBase {
       });
       });
       if(ordertmproduct.gzwtsUrl && customerinfo2.businessLicensePdf && customerinfo2.identityCardPdf){
       if(ordertmproduct.gzwtsUrl && customerinfo2.businessLicensePdf && customerinfo2.identityCardPdf){
         // otpObj["deliveryStatus"]="dsh";
         // otpObj["deliveryStatus"]="dsh";
-        await self.ordertmproductSve.update({id:ordertmproduct.id,deliveryStatus:"dsh"},t);
+        if(ordertmproduct.deliveryStatus=="dsccl"){
+          await self.ordertmproductSve.update({id:ordertmproduct.id,deliveryStatus:"dsh"},t);
+        }
         await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t});
         await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t});
       }
       }
       return system.getResultSuccess();
       return system.getResultSuccess();
@@ -187,7 +189,9 @@ class CustomerInfoService extends ServiceBase {
         otpObj["smwjUrl"]=obj.smwjUrl;
         otpObj["smwjUrl"]=obj.smwjUrl;
       }
       }
       if((ordertmproduct.gzwtsUrl || otpObj["gzwtsUrl"]) && customerinfo2.businessLicensePdf && customerinfo2.identityCardPdf){
       if((ordertmproduct.gzwtsUrl || otpObj["gzwtsUrl"]) && customerinfo2.businessLicensePdf && customerinfo2.identityCardPdf){
-        otpObj["deliveryStatus"]="dsh";
+        if(ordertmproduct.deliveryStatus=="dsccl"){
+          otpObj["deliveryStatus"]="dsh";
+        }
         await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t});
         await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t});
       
       
       }
       }