From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java |   16 +++++++++++++++-
 1 files changed, 15 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 1145624..1c49f71 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-转账
+     * 类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增
      */
     private Integer type;
 
@@ -27,10 +27,24 @@
 
     private String description;
 
+    private String remark;
+
     private Long rtMemberId;
 
     /**
      * 提现状态 1-提现中2-成功 3-拒绝
+     * 充值状态 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