承运借款流程-宁波银行

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerConfigAddParam.java

@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Author: aiqingguo
  * @Date: 2023-10-11 17:30:57
@@ -18,10 +20,13 @@ import lombok.ToString;
 public class BorrowerConfigAddParam {
 
     @ApiModelProperty(value = "借出方id", example = "1")
+    @NotNull(message = "借出方id不能为空")
     private Integer borrowerId;
     @ApiModelProperty(value = "类型：1资金 2虚拟货币", example = "1")
+    @NotNull(message = "类型不能为空")
     private Integer type;
     @ApiModelProperty(value = "借款天数", example = "1")
+    @NotNull(message = "借款天数不能为空")
     private Integer day;
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerConfigUpdateParam.java

@@ -23,10 +23,13 @@ public class BorrowerConfigUpdateParam {
     @NotNull(message = "id不能为空")
     private Integer id;
     @ApiModelProperty(value = "借出方id", example = "1")
+    @NotNull(message = "借出方id不能为空")
     private Integer borrowerId;
     @ApiModelProperty(value = "类型：1资金 2虚拟货币", example = "1")
+    @NotNull(message = "类型方不能为空")
     private Integer type;
     @ApiModelProperty(value = "借款天数", example = "1")
+    @NotNull(message = "借款天数不能为空")
     private Integer day;
 
 }

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

@@ -65,10 +65,11 @@ public class BorrowerConfigDaoImpl extends BaseDaoImpl<BorrowerConfigMapper, Bor
     }
 
     @Override
-    public Optional<BorrowerConfig> selectByBorrowerId(Integer borrowerId) {
+    public Optional<BorrowerConfig> selectByBorrowerIdAndType(Integer borrowerId, Integer type) {
         return Optional.of(borrowerId)
                 .map(item -> lQrWrapper()
                         .eq(BorrowerConfig::getBorrowerId, item)
+                        .eq(BorrowerConfig::getType, type)
                         .eq(BorrowerConfig::getDeleteStatus, BorrowerConfigEnum.DeleteStatus.NO.getCode())
                         .last("limit 1")
                 )

performance-web/src/main/java/com/clx/performance/dao/loan/BorrowerConfigDao.java

@@ -23,7 +23,7 @@ public interface BorrowerConfigDao extends BaseDao<BorrowerConfigMapper, Borrowe
     boolean updateStatus(BorrowerConfig item);
     boolean updateDelete(BorrowerConfig item);
 
-    Optional<BorrowerConfig> selectByBorrowerId(Integer borrowerId);
+    Optional<BorrowerConfig> selectByBorrowerIdAndType(Integer borrowerId, Integer type);
 
     List<BorrowerConfig> listEnable();
 

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

@@ -49,7 +49,7 @@ public class BorrowerConfigServiceImpl implements BorrowerConfigService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         // 重复验证
-        Optional<BorrowerConfig> borrowerConfigOptional = borrowerConfigDao.selectByBorrowerId(param.getBorrowerId());
+        Optional<BorrowerConfig> borrowerConfigOptional = borrowerConfigDao.selectByBorrowerIdAndType(param.getBorrowerId(), param.getType());
         if (borrowerConfigOptional.isPresent()) {
             throw new ServiceSystemException(PerformanceResultEnum.BORROWER_CONFIG_BORROWER_ID_EXIST);
         }
@@ -76,7 +76,7 @@ public class BorrowerConfigServiceImpl implements BorrowerConfigService {
         BorrowerConfig borrowerConfig = borrowerConfigDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         // 重复验证
-        Optional<BorrowerConfig> borrowerConfigOptional = borrowerConfigDao.selectByBorrowerId(param.getBorrowerId());
+        Optional<BorrowerConfig> borrowerConfigOptional = borrowerConfigDao.selectByBorrowerIdAndType(param.getBorrowerId(), param.getType());
         if (borrowerConfigOptional.isPresent() && !Objects.equals(borrowerConfig.getId(), borrowerConfigOptional.get().getId())) {
             throw new ServiceSystemException(PerformanceResultEnum.BORROWER_CONFIG_BORROWER_ID_EXIST);
         }