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

performance-api/src/main/java/com/clx/performance/param/pc/loan/owner/OwnerLoanRecordParam.java

@@ -26,6 +26,11 @@ public class OwnerLoanRecordParam {
     @NotBlank(message = "借款方不能为空")
     private String borrower;
 
+    @ApiModelProperty(value = "收款方")
+    private String payee;
+
+    @ApiModelProperty(value = "收款方账户")
+    private String payeeAccount;
 
     @ApiModelProperty(value = "借出方", example = "诚联信网络科技有限公司")
     @NotBlank(message = "借出方不能为空")

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java

@@ -61,7 +61,7 @@ public class CarrierPageSettlementDriverDetailVO {
     private BigDecimal prepayFreight;
     @ApiModelProperty(value = "预付运费标示  0:未预付 1：已预付")
     private Integer prepayFreightFlag;
-    @ApiModelProperty(value = "借款标示  0：未借款 1：已借款")
+    @ApiModelProperty(value = "借款标示  0：未借款 1：已借款 2:已还款")
     private Integer loanFlag;
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -60,7 +60,7 @@ public class CarrierPageSettlementDriverVO {
     private BigDecimal prepayFreight;
     @ApiModelProperty(value = "预付运费标示  0:未预付 1：已预付")
     private Integer prepayFreightFlag;
-    @ApiModelProperty(value = "借款标示  0：未借款 1：已借款")
+    @ApiModelProperty(value = "借款标示  0：未借款 1：已借款 2:已还款")
     private Integer loanFlag;
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -45,6 +45,8 @@ public class CarrierPageSettlementOwnerVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;
+    @ApiModelProperty(value = "借款金额")
+    private BigDecimal loanFreight;
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerDetailVO.java

@@ -65,6 +65,10 @@ public class CarrierSettlementOwnerDetailVO {
     @MoneyOutConvert
     private BigDecimal settlementFreight;
 
+    @ApiModelProperty(value = "借款金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal loanFreight;
+
     @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
     private Integer invoiceTypeCode;
 

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

@@ -36,11 +36,15 @@ public class CarrierCashierInfoVO {
     @ApiModelProperty("订单金额")
     private BigDecimal loanBalance;
 
-    @ApiModelProperty("支付方式")
-    private List<Integer> payWay;
+    @ApiModelProperty("是否有订单支付方式 true:有  false:没有")
+    private Boolean orderPayWay;
 
 
     @ApiModelProperty("付款账户")
     private String payAccount;
 
+
+    @ApiModelProperty("银行名称")
+    private String bankName;
+
 }

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerCashierInfoVO.java

@@ -36,11 +36,14 @@ public class OwnerCashierInfoVO {
     @ApiModelProperty("订单金额")
     private BigDecimal repaymentBalance;
 
-    @ApiModelProperty("支付方式")
-    private List<Integer> payWay;
+    @ApiModelProperty("是否有订单支付方式 true:有  false:没有")
+    private Boolean orderPayWay;
 
 
     @ApiModelProperty("付款账户")
     private String payAccount;
 
+    @ApiModelProperty("银行名称")
+    private String bankName;
+
 }

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -69,6 +69,10 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="结算金额",example = "1.2")
     private BigDecimal settlementFreight;
 
+    @MoneyOutConvert
+    @ApiModelProperty(value="借款抵扣金额",example = "1.2")
+    private BigDecimal loanFreight;
+
     @MoneyOutConvert
     @ApiModelProperty(value="开票金额",example = "2.1")
     private BigDecimal invoiceFreight;

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

@@ -40,8 +40,6 @@ public class CarrierSettlementOwnerController {
         return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id));
     }
 
-
-
     @ApiOperation(value = "承运端-结算单列表（货主）",notes = "<br>By:刘海泉")
     @PostMapping("/pageCarrierSettlementOwner")
     @UnitCovert(param = false)

performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriver.java

@@ -43,7 +43,7 @@ public class SettlementDriver implements HasKey<Integer> {
     private BigDecimal lossWeight;                  //货损吨数
     private BigDecimal lossFreight;                 //货损金额（分）
     private BigDecimal settlementFreight;           //结算金额（分）
-    private Integer loanFlag;                       //借款标示  0：未借款 1：已借款
+    private Integer loanFlag;                       //借款标示  0：未借款 1：已借款 2:已还款
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private String settlementPlatform;              //结算平台
     private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付

performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriverDetail.java

@@ -44,7 +44,7 @@ public class SettlementDriverDetail implements HasKey<Integer> {
     private BigDecimal lossFreight;                 //货损金额（分）
     private BigDecimal prepayFreight;               //预付运费金额（分）
     private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付
-    private Integer loanFlag;                       //借款标示  0：未借款 1：已借款
+    private Integer loanFlag;                       //借款标示  0：未借款 1：已借款 2:已还款
     private BigDecimal settlementFreight;           //结算金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private Integer status;                         //状态

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

@@ -111,7 +111,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         return returnPage;
     }
 
-
     @Override
     public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) {
 
@@ -131,8 +130,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         entity.setBorrower(param.getBorrower());
         entity.setBorrowerAccount(ownerBindCardRecord.getBankCardNumber());
         entity.setLendingParty(param.getLendingParty());
-        entity.setPayee("收款方写死");
-        entity.setPayeeAccount("收款方账户写死");
+        entity.setPayee(param.getPayee());
+        entity.setPayeeAccount(param.getPayeeAccount());
         entity.setCreateBy(loginUserInfo.getUserName());
         entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
         ownerLoanRecordDao.saveEntity(entity);
@@ -319,7 +318,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         CarrierCashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord);
-        //TODO 设置支付方式和付款账户 ，宇帆提供
+        //TODO 设置支付方式和付款账户和银行名称 ，宇帆提供
         return vo;
     }
 

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

@@ -72,7 +72,7 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         OwnerCashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment);
-        //TODO 设置支付方式和付款账户 ，宇帆提供
+        //TODO 设置支付方式和付款账户和银行名称 ，宇帆提供
         return vo;
     }