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

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

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

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

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

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

@@ -69,9 +69,11 @@ public class CarrierPageSettlementOwnerDetailVO {
     private BigDecimal invoiceFreight;              
     @ApiModelProperty(value = "开票标识：1网运单 2普通单")
     private Integer invoiceType;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "借款抵扣金额")
+    private BigDecimal loanFreight;
     @ApiModelProperty("结算方式  1装车净重 2卸车净重")
     private Integer settlementWay;
-
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 

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

@@ -67,6 +67,8 @@ public class OwnerLoanAccountServiceImpl  implements OwnerLoanAccountService {
             return OwnerAccountVO.builder().openAccount(0).build();
         }
         OwnerLoanAccount ownerLoanAccount  = optional.get();
-        return  ownerLoanAccountStruct.convertVO(ownerLoanAccount);
+        OwnerAccountVO ownerAccountVO = ownerLoanAccountStruct.convertVO(ownerLoanAccount);
+        ownerAccountVO.setOpenAccount(1);
+        return ownerAccountVO;
     }
 }