From 78bbc1dae1bb20acb51fd454adf53b3ab5ae97b3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Dec 2022 15:20:11 +0800
Subject: [PATCH] 20221221
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 82 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 0949c74..04ebeb0 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -15,17 +15,23 @@
end phone,
c.description memberLevel
from mall_money_flow a
- 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'
+ inner join mall_member b on a.rt_member_id=b.id
+
<where>
- <if test="record.type == 3">
+ <if test="record.inOrOut == 3">
and a.amount > 0
</if>
- <if test="record.type == 2">
+ <if test="record.inOrOut == 2">
and 0 > a.amount
</if>
<if test="record.memberId != null">
- and a.member_id=#{record.memberId}
+ and a.rt_member_id=#{record.memberId}
+ </if>
+ <if test="record.flowType != null and record.flowType != ''">
+ and a.flow_type=#{record.flowType}
+ </if>
+ <if test="record.type != null and record.type != ''">
+ and a.type=#{record.type}
</if>
</where>
order by a.created_time desc
@@ -52,6 +58,9 @@
<if test="record.type!=null and record.type!=''">
and a.type like concat('%', #{record.type},'%')
</if>
+ <if test="record.flowType!=null and record.flowType!=''">
+ and a.flow_type like concat('%', #{record.flowType},'%')
+ </if>
</if>
</where>
order by a.created_time desc
@@ -59,14 +68,18 @@
<select id="getMoneyChargeListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyChargeListVo">
select
- a.*,
+ a.id id,
+ a.created_time createdTime,
+ a.amount amount,
+ a.amount_fee amountFee,
+ a.withdraw_no withdrawNo,
+ a.remark remark,
+ a.status status,
b.name,
- b.bind_phone bindPhone,
b.phone
- from mall_money_flow a
+ from mall_member_withdraw a
inner join mall_member b on a.member_id=b.id
<where>
- a.type = 6
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and b.name like concat('%', #{record.name},'%')
@@ -96,6 +109,55 @@
</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,17) and member_id=#{memberId}
+ <if test="type == 1">
+ and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </if>
+ <if test="type == 2">
+ and date_format(created_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
+ </if>
+ </select>
+
+ <select id="selectThankfulCommission" resultType="java.math.BigDecimal">
+ select ifnull(sum(amount),0) from mall_money_flow
+ where flow_type=4 and amount > 0
+ and member_id=#{memberId}
+ and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ and type in (2,3,4)
+ </select>
+
+ <select id="selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ select a.*
+ from mall_money_flow a
+ where a.member_id = #{memberId}
+ and a.order_no = #{orderNo}
+ and a.type = #{type}
+ and a.status = #{status}
+ and a.is_return = #{isReturn}
+ </select>
+
+ <select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
+ select
+ a.*,
+ b.name memberName
+ from mall_money_flow a
+ inner join mall_member b on b.id = a.rt_member_id
+ where a.order_no = #{record.orderNo}
+ order by a.CREATED_TIME desc
+ </select>
+
+ <select id="selectSumAmountByStatusAndMemberId" resultType="java.math.BigDecimal">
+ select
+ ifnull(sum(a.amount),0)
+ from mall_member_withdraw a
+ where
+ a.member_id = #{memberId}
+ and a.status = #{status}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1