Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -116,7 +116,9 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     ORDER_CHILD_SYNC_ERROR(2001, "承运同步网络货运异常"),
     BORROWER_NAME_EXIST(1701, "数据重复，请核实后重新提交"),
-    BORROWER_CONFIG_BORROWER_ID_EXIST(1701, "数据重复，请核实后重新提交"),
+    BORROWER_DELETE_ENABLE_ERROR(1702, "无法删除启用数据"),
+    BORROWER_CONFIG_BORROWER_ID_EXIST(1703, "数据重复，请核实后重新提交"),
+    BORROWER_CONFIG_DELETE_ENABLE_ERROR(1704, "无法删除启用数据"),
 
     NB_BANK_API_ERROR(1800, "宁波银行api调用失败"),
     NB_BANK_NOTIFY_ERROR(1801, "宁波银行回调失败"),

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

@@ -113,6 +113,9 @@ public class BorrowerConfigServiceImpl implements BorrowerConfigService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         BorrowerConfig borrowerConfig = borrowerConfigDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (Objects.equals(borrowerConfig.getStatus(), BorrowerConfigEnum.Status.ENABLE)){
+            throw new ServiceSystemException(PerformanceResultEnum.BORROWER_CONFIG_DELETE_ENABLE_ERROR);
+        }
 
         borrowerConfig.setDeleteStatus(BorrowerConfigEnum.DeleteStatus.YES.getCode());
         borrowerConfig.setOpUserNo(loginUserInfo.getUserNo());

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

@@ -102,6 +102,9 @@ public class BorrowerServiceImpl implements BorrowerService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         Borrower borrower = borrowerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (Objects.equals(borrower.getStatus(), BorrowerEnum.Status.ENABLE)){
+            throw new ServiceSystemException(PerformanceResultEnum.BORROWER_DELETE_ENABLE_ERROR);
+        }
 
         borrower.setDeleteStatus(BorrowerEnum.DeleteStatus.YES.getCode());
         borrower.setOpUserNo(loginUserInfo.getUserNo());