From 8049faa20ca33b159f6384bbbc2d3429ad8be41b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 20:36:24 +0800
Subject: [PATCH] 20221227 ε
εΌε½ι
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index eded054..f340c0e 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -12,11 +12,10 @@
a.*,
case when a.rt_member_id is null then (select n.phone from mall_member n where n.id=a.member_id)
when a.rt_member_id is not null then (select m.phone from mall_member m where m.id=a.rt_member_id)
- end phone,
- c.description memberLevel
+ end phone
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.inOrOut == 3">
and a.amount > 0
@@ -25,7 +24,7 @@
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}
@@ -68,14 +67,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},'%')
@@ -111,7 +114,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) 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>
@@ -127,4 +130,33 @@
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