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/resources/mapper/modules/MallMoneyFlowMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 85f50cd..471ffd0 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -18,6 +18,7 @@
             left join mall_member b on a.rt_member_id=b.id
             left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL'
         <where>
+            1=1 and a.status = 2
             <if test="record.inOrOut == 3">
                 and a.amount > 0
             </if>
@@ -61,6 +62,12 @@
                 </if>
                 <if test="record.flowType!=null and record.flowType!=''">
                     and a.flow_type like concat('%',  #{record.flowType},'%')
+                </if>
+                <if test="record.startTime != null and record.startTime != ''">
+                    and a.created_time &gt;= #{record.startTime}
+                </if>
+                <if test="record.endTime != null and record.endTime != ''">
+                    and a.created_time &lt;= #{record.endTime}
                 </if>
             </if>
         </where>
@@ -159,4 +166,22 @@
             </if>
         </where>
     </select>
+
+
+
+    <select id="selectFlowInPage" resultType="cc.mrbird.febs.mall.vo.ApiMoneyFlowVo">
+        select
+               a.amount amount,
+               a.status status,
+               a.CREATED_TIME createdTime,
+               a.remark remark
+        from mall_money_flow a
+        <where>
+            and a.member_id = #{record.memberId}
+            <if test="record.flowType!=null and record.flowType!=''">
+                and  a.flow_type = #{record.flowType}
+            </if>
+        </where>
+        order by a.CREATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1