Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

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

@@ -10,7 +10,6 @@ import java.util.Optional;
 public enum OwnerLoanRecordEnum {
     ;
 
-    //“待审批”，“审批通过”，“审批拒绝”，“付款中”，“付款成功”，“付款失败”
     @Getter
     @AllArgsConstructor
     public enum Status {

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

@@ -31,6 +31,6 @@ public class PageCarrierOwnerLoanRecordParam  extends PageParam {
     @ApiModelProperty("借款类型 1:虚拟货币  2:资金")
     private Integer loanType;
 
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;
 }

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

@@ -25,7 +25,7 @@ public class PageOwnerLoanRecordOfOwner extends PageParam {
     @ApiModelProperty(value = "借款类型 1:虚拟货币  2:资金", example = "1")
     private Integer loanType;
 
-    @ApiModelProperty(value = "10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ", example = "1")
+    @ApiModelProperty(value = "10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ", example = "1")
     private Integer status;
 
 }
\ No newline at end of file

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

@@ -43,7 +43,7 @@ public class CarrierOwnerOrderPaymentDetailVO {
 
 
 
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;
 
     @ApiModelProperty("订单支付状态 10 待付款 40 付款中 50 付款成功 60 付款失败")

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

@@ -95,11 +95,11 @@ public class ExportOwnerLoanRecordVO {
     private String payeeBankCode;
 
    
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;
 
 
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private String statusMsg;
 
     public String getStatusMsg(){

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

@@ -91,11 +91,11 @@ public class OwnerLoanRecordVO {
     private String payeeBankCode;
 
    
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;
 
 
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private String statusMsg;
 
     public String getStatusMsg(){

performance-web/src/main/java/com/clx/performance/config/RabbitBeanConfig.java

@@ -200,4 +200,24 @@ public class RabbitBeanConfig {
     public Binding ownerLoanBind() {
         return BindingBuilder.bind(ownerLoanQueue()).to(ownerLoanExchange()).with(RabbitKeyConstants.OWNER_LOAN_ROUTE_KEY);
     }
+
+
+    /**
+     * 货主还款队列
+     * @return
+     */
+    @Bean
+    public Queue ownerRepaymentQueue() {
+        return new Queue(RabbitKeyConstants.OWNER_REPAYMENT_QUEUE, true, false, false);
+    }
+    /**
+     * 货主还款bind
+     * @return
+     */
+    @Bean
+    public Binding ownerRepaymentBind() {
+        return BindingBuilder.bind(ownerLoanQueue()).to(ownerLoanExchange()).with(RabbitKeyConstants.OWNER_REPAYMENT_ROUTE_KEY);
+    }
+
+
 }

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -93,4 +93,8 @@ public class RabbitKeyConstants {
     public static final String OWNER_LOAN_ROUTE_KEY ="clx-performance.loan.route.key";
 
     public static final String OWNER_LOAN_QUEUE ="clx-performance.loan.queue";
+
+    public static final String OWNER_REPAYMENT_QUEUE ="clx-performance.owner.repayment.queue";
+    public static final String OWNER_REPAYMENT_ROUTE_KEY ="clx-performance.owner.repayment.route.key";
+
 }

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

@@ -138,7 +138,7 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     private String payeeBankCode;
 
     @TableField("status")
-    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    @ApiModelProperty("10 待审批 15 待付款 20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;
 
     @TableField("approve_time")