From 55ed00804fcd0e8fe9026ae6464bfb69d3eb0d15 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 15:11:41 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 203a726..bb1a982 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -109,12 +109,13 @@
</update>
<select id="selectProfitByDateAndMemberId" resultType="java.math.BigDecimal">
- select ifnull(sum(a.amount),0) from mall_money_flow a where member_id=#{memberId} and type in (1,2) and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d');
+ select ifnull(sum(a.amount),0) from mall_money_flow a
+ where member_id=#{memberId} and flow_type=4 and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d') and amount > 0
</select>
<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) and member_id=#{memberId}
+ where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -130,4 +131,31 @@
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
and type in (2,3,4)
</select>
+
+ <select id="selectOneByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ select a.* from mall_money_flow a
+ 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