From bec7abc34ffb9a9de3f5d225bf233a311ff68938 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 16 Jun 2022 16:36:32 +0800 Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz --- src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java index f0c5a05..5d43427 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java @@ -19,7 +19,7 @@ private BigDecimal amount; /** - * 流水类型 1-直推奖励 2-团队奖励 3-订单支付 4-退款 5-转账 6-提现 7-排名奖励 + * 类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 */ private Integer type; @@ -35,4 +35,15 @@ * 提现状态 1-提现中2-成功 3-拒绝 */ private Integer status; + + /** + * 是否返利 1-是 2-否 + */ + private Integer isReturn; + public static final Integer IS_RETURN_Y = 1; + + /** + * 流水类型 1-余额 2-赠送积分 3-竞猜积分 4-佣金 + */ + private Integer flowType; } -- Gitblit v1.9.1