优化

cif-service/src/main/java/com/txz/cif/model/Flow.java

@@ -55,6 +55,10 @@ public class Flow {
     @ApiModelProperty(value="借方账户")
     private Long debitAccount;
 
+    @Column(name = "user_id")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
     /**
      * 出金账户
      */
@@ -62,10 +66,21 @@ public class Flow {
     @ApiModelProperty(value="贷方账户")
     private Long creditAccount;
 
+
+    @Column(name = "freeze_amount")
+    @ApiModelProperty(value="冻结金额")
+    private BigDecimal freezeAmount;
+
+
+
+    @ApiModelProperty(value="余额")
+    private BigDecimal balance;
+
+
     /**
-     * 类型 1充值 2转账 3提现 4冻结 5解冻 6收费 7佣金
+     * 类型 1充值 2转账 3提现 4冻结 5解冻 6收费 7佣金 8结转 9退款 10返点
      */
-    @ApiModelProperty(value="type类型 1充值 2转账 3提现 4冻结 5解冻 6收费 7佣金 8结转")
+    @ApiModelProperty(value="type类型 1充值 2转账 3提现 4冻结 5解冻 6收费 7佣金 8结转 9退款 10返点")
     private Integer type;
 
     /**

cif-service/src/main/java/com/txz/cif/service/impl/FlowServiceImpl.java

@@ -173,9 +173,10 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
             return Result.genFailResult("账号未找到");
         }
         flow = Flow.builder().amount(param.getDiscount()).bizType(10)
+                .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .debitAccount(MyConstants.INNER_REBATE).creditAccount(account.getId())
-                .bizId(param.getBizId()).type(1)
+                .bizId(param.getBizId()).type(10)
                 .build();
         saveUseGeneratedKeys(flow);
         //借 ：平台资金银行xx元  内部户1（资产类：借方账户）+钱
@@ -211,6 +212,7 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         //贷：平台主营收入（贷）   +500元
         Date today = DateUtil.date();
         Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
+                .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .debitAccount(account.getId()).creditAccount(MyConstants.INNER_INCOME)
                 .bizId(param.getBizId()).type(6)
@@ -247,9 +249,10 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         }
         Date today = DateUtil.date();
         Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
+                .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .debitAccount(MyConstants.INNER_REFUND).creditAccount(account.getId())
-                .bizId(param.getBizId()).type(6)
+                .bizId(param.getBizId()).type(9)
                 .build();
         saveUseGeneratedKeys(flow);
         //借：主营支出-退款（借）     +100元
@@ -281,9 +284,10 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
 
         Date today = DateUtil.date();
         Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
+                .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .creditAccount(MyConstants.INNER_CAPITAL).debitAccount(account.getId())
-                .bizId(param.getBizId()).type(1)
+                .bizId(param.getBizId()).type(3)
                 .build();
         saveUseGeneratedKeys(flow);
 

cif-service/src/main/resources/mapper/FlowMapper.xml

@@ -7,14 +7,16 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="biz_no" jdbcType="VARCHAR" property="bizNo" />
-    <result column="diagnosis_no" jdbcType="VARCHAR" property="diagnosisNo" />
+    <result column="biz_id" jdbcType="VARCHAR" property="bizId" />
+    <result column="freezd_id" jdbcType="VARCHAR" property="freezdId" />
     <result column="debit_account" jdbcType="BIGINT" property="debitAccount" />
     <result column="credit_account" jdbcType="BIGINT" property="creditAccount" />
-    <result column="biz_id" jdbcType="BIGINT" property="bizId" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="amount" jdbcType="DECIMAL" property="amount" />
+    <result column="balance" jdbcType="DECIMAL" property="balance" />
+    <result column="freeze_amount" jdbcType="DECIMAL" property="freezeAmount" />
     <result column="biz_type" jdbcType="INTEGER" property="bizType" />
-    <result column="status" jdbcType="INTEGER" property="status" />
     <result column="trans_time" jdbcType="TIMESTAMP" property="transTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />