From 1fc5510367dcf321ac85e50e31c9dcdaaf5cd09e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 11:56:27 +0800
Subject: [PATCH] 20221221
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index b29b561..de38deb 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -58,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
@@ -65,14 +68,19 @@
<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},'%')
@@ -102,12 +110,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 amount > 0 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>
@@ -115,4 +124,22 @@
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.memberId = #{memberId}
+ and a.order_no = #{orderNo}
+ and a.type = #{type}
+ and a.status = #{status}
+ and a.is_return = #{isReturn}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1