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

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

@@ -82,6 +82,13 @@ public class OwnerLoanRecordVO {
     @ApiModelProperty("收款账户")
     private String payeeAccount;
 
+
+    @ApiModelProperty("收款银行")
+    private String payeeBank;
+
+    @ApiModelProperty("收款行号")
+    private String payeeBankCode;
+
    
     @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;

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

@@ -135,4 +135,13 @@ public class OwnerRepaymentVO {
     
     @ApiModelProperty("修改时间")
     private String modifiedTime;
+
+
+    @ApiModelProperty("收款银行")
+    private String payeeBank;
+
+
+    @ApiModelProperty("收款行号")
+    private String payeeBankCode;
+
 }

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -83,10 +83,10 @@ public class OrderChildLoanComponent {
 
         if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
             log.info("3.进行标吨判断");
-            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
+            determine(quotationDetailVO.getLatestPrice().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         } else {
             log.info("3.进行超吨判断");
-            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
+            determine(quotationDetailVO.getLatestPrice().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         }
     }
 

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

@@ -96,6 +96,14 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     @ApiModelProperty("收款账户")
     private String payeeAccount;
 
+    @TableField("payee_bank")
+    @ApiModelProperty("收款银行")
+    private String payeeBank;
+
+    @TableField("payee_bank_code")
+    @ApiModelProperty("收款行号")
+    private String payeeBankCode;
+
     @TableField("status")
     @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
     private Integer status;

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

@@ -82,6 +82,14 @@ public class OwnerRepayment implements HasKey<Integer> {
     @ApiModelProperty("收款账户")
     private String payeeAccount;
 
+    @TableField("payee_bank")
+    @ApiModelProperty("收款银行")
+    private String payeeBank;
+
+    @TableField("payee_bank_code")
+    @ApiModelProperty("收款行号")
+    private String payeeBankCode;
+
     @TableField("loan_no")
     @ApiModelProperty("借款单号")
     private Long loanNo;