承运借款流程-借款账户

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

 package com.clx.performance.vo.pc.loan.carrier;
 
+import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -8,7 +10,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
 * @Author: aiqinguo
@@ -40,8 +41,22 @@ public class OwnerLoanAccountRunningWaterRecordVO {
     private String childNo;
     @ApiModelProperty(value = "流水类型 70：运单核销 80：借款", example = "10")
     private Integer runningWaterType;
+    @ApiModelProperty(value = "流水类型 70：运单核销 80：借款", example = "10")
+    private String runningWaterTypeMsg;
+    public String getRunningWaterTypeMsg() {
+        return OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.getMsgByCode(runningWaterType);
+    }
+
+    @MoneyOutConvert
     @ApiModelProperty(value = "金额", example = "1.23")
     private BigDecimal alterationBalance;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "可用余额", example = "1.23")
+    private BigDecimal useableBalance;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "冻结余额", example = "1.23")
+    private BigDecimal frozenBalance;
+    @MoneyOutConvert
     @ApiModelProperty(value = "账户余额", example = "1.23")
     private BigDecimal accountBalance;
     @ApiModelProperty(value = "创建人", example = "张三")

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

@@ -68,7 +68,14 @@ public class OwnerLoanAccountRunningWaterRecord implements HasKey<Integer> {
     @ApiModelProperty("金额")
     private BigDecimal alterationBalance;
 
-    
+    @TableField("useable_balance")
+    @ApiModelProperty("可用余额")
+    private BigDecimal useableBalance;
+
+    @TableField("frozen_balance")
+    @ApiModelProperty("冻结余额")
+    private BigDecimal frozenBalance;
+
     @TableField("account_balance")
     @ApiModelProperty("账户余额")
     private BigDecimal accountBalance;