Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/enums/loan/BorrowerConfigEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum BorrowerConfigEnum {
@@ -19,11 +20,11 @@ public enum BorrowerConfigEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
         }
 
-        public static String getMsgByCode(int code) {
+        public static String getMsgByCode(Integer code) {
             return getByCode(code).map(Status::getMsg).orElse(null);
         }
     }

performance-api/src/main/java/com/clx/performance/enums/loan/BorrowerEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum BorrowerEnum {
@@ -19,11 +20,11 @@ public enum BorrowerEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
         }
 
-        public static String getMsgByCode(int code) {
+        public static String getMsgByCode(Integer code) {
             return getByCode(code).map(Status::getMsg).orElse(null);
         }
     }

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanAccountApproveEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum OwnerLoanAccountApproveEnum {
@@ -21,8 +22,8 @@ public enum OwnerLoanAccountApproveEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<OwnerLoanAccountApproveEnum.Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<OwnerLoanAccountApproveEnum.Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
         }
 
         public static String getMsgByCode(int code) {

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanAccountRunningWaterRecordEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum OwnerLoanAccountRunningWaterRecordEnum {
@@ -20,11 +21,11 @@ public enum OwnerLoanAccountRunningWaterRecordEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<OwnerLoanAccountRunningWaterRecordEnum.RunWaterType> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<OwnerLoanAccountRunningWaterRecordEnum.RunWaterType> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
         }
 
-        public static String getMsgByCode(int code) {
+        public static String getMsgByCode(Integer code) {
             return getByCode(code).map(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType::getMsg).orElse(null);
         }
     }

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanRecordEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum OwnerLoanRecordEnum {
@@ -24,11 +25,11 @@ public enum OwnerLoanRecordEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code, code)).findFirst();
         }
 
-        public static String getMsgByCode(int code) {
+        public static String getMsgByCode(Integer code) {
             return getByCode(code).map(Status::getMsg).orElse(null);
         }
     }
@@ -44,11 +45,11 @@ public enum OwnerLoanRecordEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<LoanType> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<LoanType> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e ->Objects.equals(e.code, code)).findFirst();
         }
 
-        public static String getMsgByCode(int code) {
+        public static String getMsgByCode(Integer code) {
             return getByCode(code).map(LoanType::getMsg).orElse(null);
         }
     }

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerPaymentEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum OwnerPaymentEnum {
@@ -22,8 +23,8 @@ public enum OwnerPaymentEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<OwnerPaymentEnum.Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<OwnerPaymentEnum.Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
         }
 
         public static String getMsgByCode(int code) {

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerRePaymentEnum.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 public enum OwnerRePaymentEnum {
@@ -22,8 +23,8 @@ public enum OwnerRePaymentEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<OwnerRePaymentEnum.Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        public static Optional<OwnerRePaymentEnum.Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
         }
 
         public static String getMsgByCode(int code) {

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

@@ -26,7 +26,14 @@ public class BorrowerAddParam {
     @NotBlank(message = "所属银行不能为空")
     private String bankName;
     @ApiModelProperty(value = "银行账号", example = "10000000000000000")
-    @NotBlank(message = "不能为空")
+    @NotBlank(message = "银行账号不能为空")
     private String bankCardNo;
 
+    @ApiModelProperty(value = "开户行行号", example = "313332082914")
+    @NotBlank(message = "开户行行号不能为空")
+    private String openBankId;
+    @ApiModelProperty(value = "开户行", example = "宁波银行")
+    @NotBlank(message = "开户行不能为空")
+    private String openBank;
+
 }

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

@@ -33,4 +33,11 @@ public class BorrowerUpdateParam {
     @NotBlank(message = "银行账号不能为空")
     private String bankCardNo;
 
+    @ApiModelProperty(value = "开户行行号", example = "313332082914")
+    @NotBlank(message = "开户行行号不能为空")
+    private String openBankId;
+    @ApiModelProperty(value = "开户行", example = "宁波银行")
+    @NotBlank(message = "开户行不能为空")
+    private String openBank;
+
 }

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/BorrowerVO.java

@@ -7,8 +7,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
-
 /**
 * @Author: aiqinguo
 * @Description: 借出方
@@ -25,17 +23,21 @@ public class BorrowerVO {
 
     @ApiModelProperty(value = "id", example = "")
     private Integer id;
-    @ApiModelProperty(value = "借出方", example = "")
+    @ApiModelProperty(value = "借出方", example = "1")
     private String name;
-    @ApiModelProperty(value = "所属银行", example = "")
+    @ApiModelProperty(value = "所属银行", example = "工商银行")
     private String bankName;
-    @ApiModelProperty(value = "银行账号", example = "")
+    @ApiModelProperty(value = "银行账号", example = "1111111111111111")
     private String bankCardNo;
-    @ApiModelProperty(value = "状态：1启用 2禁用", example = "")
+    @ApiModelProperty(value = "开户行行号", example = "313332082914")
+    private String openBankId;
+    @ApiModelProperty(value = "开户行", example = "宁波银行")
+    private String openBank;
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "1")
     private Integer status;
-    @ApiModelProperty(value = "操作人编码", example = "")
+    @ApiModelProperty(value = "操作人编码", example = "1000000")
     private Long opUserNo;
-    @ApiModelProperty(value = "操作人", example = "")
+    @ApiModelProperty(value = "操作人", example = "张三")
     private String opUserName;
     @ApiModelProperty(value = "操作时间", example = "")
     private String opTime;

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

@@ -33,6 +33,8 @@ public class BorrowerDaoImpl extends BaseDaoImpl<BorrowerMapper, Borrower, Integ
                 .set(Borrower::getName, item.getName())
                 .set(Borrower::getBankName, item.getBankName())
                 .set(Borrower::getBankCardNo, item.getBankCardNo())
+                .set(Borrower::getOpenBankId, item.getOpenBankId())
+                .set(Borrower::getOpenBank, item.getOpenBank())
 
                 .set(Borrower::getOpUserNo, item.getOpUserNo())
                 .set(Borrower::getOpUserName, item.getOpUserName())

performance-web/src/main/java/com/clx/performance/model/loan/Borrower.java

@@ -29,6 +29,8 @@ public class Borrower implements HasKey<Integer> {
     private String name;                            //借出方
     private String bankName;                        //所属银行
     private String bankCardNo;                      //银行账号
+    private String openBankId;                      //开户行行号
+    private String openBank;                        //开户行
     private Integer deleteStatus;                   //删除状态: 0-否;1-是
     private Integer status;                         //状态：1启用 2禁用
     private Long opUserNo;                          //操作人编码

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

@@ -53,6 +53,8 @@ public class BorrowerServiceImpl implements BorrowerService {
         borrower.setName(param.getName());
         borrower.setBankName(param.getBankName());
         borrower.setBankCardNo(param.getBankCardNo());
+        borrower.setOpenBankId(param.getOpenBankId());
+        borrower.setOpenBank(param.getOpenBank());
 
         borrower.setOpUserNo(loginUserInfo.getUserNo());
         borrower.setOpUserName(loginUserInfo.getUserName());
@@ -76,6 +78,8 @@ public class BorrowerServiceImpl implements BorrowerService {
         borrower.setName(param.getName());
         borrower.setBankName(param.getBankName());
         borrower.setBankCardNo(param.getBankCardNo());
+        borrower.setOpenBankId(param.getOpenBankId());
+        borrower.setOpenBank(param.getOpenBank());
 
         borrower.setOpUserNo(loginUserInfo.getUserNo());
         borrower.setOpUserName(loginUserInfo.getUserName());