Browse Source

修改 续费生成协议BUG 修复

hgw 3 years ago
parent
commit
bddbc0c11e

+ 8 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantContractRecordServiceImpl.java

@@ -41,12 +41,14 @@ public class TenantContractRecordServiceImpl extends ServiceImpl<TenantContractR
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertContractRecord(Integer tenantId, String contractPath, TenantContractRecordEnum en) {
-        //一个机构只能创建一个开通协议
-        TenantContractRecord open = this.getOne(new QueryWrapper<>(new TenantContractRecord())
-                .eq("tenant_id_", tenantId)
-                .eq("type_", TenantContractRecordEnum.OPEN.getType()));
-        if (Objects.nonNull(open)) {
-            return 1;
+        if(en.equals(TenantContractRecordEnum.OPEN)){
+            //一个机构只能创建一个开通协议
+            TenantContractRecord open = this.getOne(new QueryWrapper<>(new TenantContractRecord())
+                    .eq("tenant_id_", tenantId)
+                    .eq("type_", TenantContractRecordEnum.OPEN.getType()));
+            if (Objects.nonNull(open)) {
+                return 1;
+            }
         }
 
         Date now = new Date();

+ 4 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -684,6 +684,10 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
         //删除本次PDF生成的文件缓存
         FileUtils.deleteQuietly(srcFile);
+        //删除缓存
+        if(en.equals(TenantContractRecordEnum.RENEW)){
+            redissonClient.getBucket(key).delete();
+        }
         return pdfFilePath;
     }