From 971f739f9ee5fb868d72f9a85d65e9f0791d5032 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Mar 2023 12:35:36 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index df94c30..a453577 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -63,7 +63,7 @@
and b.phone like concat('%', #{record.phone},'%')
</if>
<if test="record.type!=null and record.type!=''">
- and a.type like concat('%', #{record.type},'%')
+ and a.type = #{record.type}
</if>
<if test="record.flowType!=null and record.flowType!=''">
and a.flow_type like concat('%', #{record.flowType},'%')
@@ -123,7 +123,7 @@
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
- where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
+ where type in (2,19,20,21,22,23,24,27,28,29,30) and member_id=#{memberId}
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -181,9 +181,18 @@
inner join mall_member b on b.id = a.member_id
inner join mall_member c on c.invite_id = b.referrer_id and c.level = b.level
where
- a.type >= 19
- and a.type <= 27
+ a.type IN (19, 20, 21, 22, 23, 24, 27)
and date_format(a.created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
group by a.member_id;
</select>
+
+ <select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
+ select
+ a.*,
+ b.name fromMemberName
+ from mall_money_flow a
+ left join mall_member b on a.member_id = b.id
+ where a.order_no = #{record.orderNo}
+ order by a.CREATED_TIME desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1