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

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

@@ -8,6 +8,8 @@ import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Objects;
+
 /**
  * @ClassName OwnerLoanRunWaterRecordVO
  * @Description
@@ -67,6 +69,15 @@ public class OwnerLoanRunWaterRecordVO {
     @ApiModelProperty("账户余额")
     private BigDecimal accountBalance;
 
+    @MoneyOutConvert
+    @ApiModelProperty("可用余额")
+    private BigDecimal useAbleBalance;
+
+
+    @MoneyOutConvert
+    @ApiModelProperty("冻结余额")
+    private BigDecimal frozenBalance;
+
     
     @ApiModelProperty("创建人")
     private String createBy;

performance-web/src/main/java/com/clx/performance/dto/OwnerLoanAccountRunWaterRecordDTO.java

@@ -35,10 +35,10 @@ public class OwnerLoanAccountRunWaterRecordDTO {
     private String mobile;
 
     @ExcelProperty("流水号")
-    private Long runningWaterNo;
+    private String runningWaterNo;
 
     @ExcelProperty("借款单号")
-    private Long loanNo;
+    private String loanNo;
 
     @ExcelProperty("运单编号")
     private String childNo;
@@ -68,11 +68,27 @@ public class OwnerLoanAccountRunWaterRecordDTO {
         return Objects.isNull(accountBalance)? null : accountBalance.movePointLeft(2);
     }
 
+
+    @ExcelProperty("可用余额")
+    private BigDecimal useAbleBalance;
+
+    public BigDecimal getUseAbleBalance(){
+        return Objects.isNull(useAbleBalance)? null : useAbleBalance.movePointLeft(2);
+    }
+
+
+    @ExcelProperty("冻结余额")
+    private BigDecimal frozenBalance;
+
+    public BigDecimal getFrozenBalance(){
+        return Objects.isNull(frozenBalance)? null : frozenBalance.movePointLeft(2);
+    }
+
     @ExcelProperty("操作人")
     private String createBy;
 
     @ExcelProperty("操作时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
 
 }