From d5a0907b0bb734e13cae2092f3a004c30791a0e6 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 14:03:28 +0800
Subject: [PATCH] feat(mall): 添加活动模块 - 新增 ActivityServiceImpl 类实现活动服务 - 添加 AdminActivityController 和 ViewActivityController 控制器处理活动相关请求 - 创建 IActivityService 接口定义活动服务方法 - 设计 MallActivity 实体类表示活动信息 - 增加 MallActivityMapper 接口用于活动数据访问
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f94d009..6840259 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>
@@ -48,6 +49,7 @@
inner join mall_member b on a.member_id=b.id
left join mall_order_info c on a.order_no = c.order_no
<where>
+ 1=1 and a.status = 2
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and b.name like concat('%', #{record.name},'%')
@@ -60,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 >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and a.created_time <= #{record.endTime}
</if>
</if>
</where>
@@ -134,6 +142,28 @@
<select id="selectOneByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
select a.* from mall_money_flow a
- where a.order_no = #{} and a.member_id = #{memberId}
+ where a.order_no = #{rechargeNo} and a.member_id = #{memberId}
+ </select>
+
+ <select id="selectAmountByFlowtypeAndType" resultType="java.math.BigDecimal">
+ select ifnull(sum(a.amount),0) from mall_money_flow a
+ <where>
+ a.member_id = #{memberId}
+ <if test="flowType!=null and flowType!=''">
+ and a.flow_type = #{flowType}
+ </if>
+ <if test="type!=null and type!=''">
+ and a.type = #{type}
+ </if>
+ <if test="status!=null and status!=''">
+ and a.status = #{status}
+ </if>
+ <if test="dateDay!=null">
+ and date_format(a.created_time, '%Y-%m-%d') = date_format(#{dateDay}, '%Y-%m-%d')
+ </if>
+ <if test="dateMonth!=null">
+ and date_format(a.created_time, '%Y-%m') = date_format(#{dateMonth}, '%Y-%m')
+ </if>
+ </where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1