Merge remote-tracking branch 'origin/v11.1_plat_acc_config_20240125' into…

performance-web/src/main/java/com/clx/performance/dao/impl/PlatformAccountConfigImpl.java

@@ -27,7 +27,7 @@ public class PlatformAccountConfigImpl extends BaseDaoImpl<PlatformAccountConfig
     @Override
     public IPage<PlatformAccountConfig> pagePlatformAccountConfig(PagePlatformAccountConfigParam param) {
         LambdaQueryWrapper<PlatformAccountConfig> query = new LambdaQueryWrapper<>();
-        query.eq(PlatformAccountConfig :: getDeleteStatus, DeleteStatusEnum.YES.getCode());
+        query.eq(PlatformAccountConfig :: getDeleteStatus, DeleteStatusEnum.NO.getCode());
         if(Objects.nonNull(param.getBusinessType())){
             query.eq(PlatformAccountConfig :: getBusinessType,param.getBusinessType());
         }
@@ -42,7 +42,7 @@ public class PlatformAccountConfigImpl extends BaseDaoImpl<PlatformAccountConfig
     public boolean deletePlatformAccountConfig(Integer id) {
         return update(lUdWrapper()
                 .eq(PlatformAccountConfig::getId, id)
-                .set(PlatformAccountConfig::getDeleteStatus, DeleteStatusEnum.NO.getCode())
+                .set(PlatformAccountConfig::getDeleteStatus, DeleteStatusEnum.YES.getCode())
         );
     }
 
@@ -67,7 +67,7 @@ public class PlatformAccountConfigImpl extends BaseDaoImpl<PlatformAccountConfig
     @Override
     public List<PlatformAccountConfig> checkPlatformAccountConfigOnly(PlatformAccountConfig config) {
         LambdaQueryWrapper<PlatformAccountConfig> query = new LambdaQueryWrapper<>();
-        query.eq(PlatformAccountConfig :: getDeleteStatus, DeleteStatusEnum.YES.getCode());
+        query.eq(PlatformAccountConfig :: getDeleteStatus, DeleteStatusEnum.NO.getCode());
         if(Objects.equals(config.getBusinessType(), PlatformAccountConfigEnum.BusinessType.SETTLE.getCode())){
             query.eq(PlatformAccountConfig :: getBusinessType, config.getBusinessType());
             query.eq(PlatformAccountConfig :: getOwnerType, config.getOwnerType());
@@ -99,7 +99,7 @@ public class PlatformAccountConfigImpl extends BaseDaoImpl<PlatformAccountConfig
                                                                       Integer invoiceCompanyId,
                                                                       Integer configRange){
         LambdaQueryWrapper<PlatformAccountConfig> query = new LambdaQueryWrapper<>();
-        query.eq(PlatformAccountConfig :: getDeleteStatus, DeleteStatusEnum.YES.getCode());
+        query.eq(PlatformAccountConfig :: getDeleteStatus, DeleteStatusEnum.NO.getCode());
         if(Objects.nonNull(businessType)){
             query.eq(PlatformAccountConfig :: getBusinessType, businessType);
         }

performance-web/src/main/java/com/clx/performance/service/impl/PlatformAccountConfigServiceImpl.java

@@ -97,7 +97,7 @@ public class PlatformAccountConfigServiceImpl implements PlatformAccountConfigSe
         config.setOpenBank(param.getOpenBank());
         config.setBankCode(param.getBankCode());
         config.setBankCardNo(param.getBankCardNo());
-        config.setDeleteStatus(DeleteStatusEnum.YES.getCode());
+        config.setDeleteStatus(DeleteStatusEnum.NO.getCode());
         config.setCreateUserNo(loginUserInfo.getUserNo());
         config.setCreateUserName(loginUserInfo.getUserName());
         if(!checkConfigOnly(config)){