From e9892b2cfb4b33ecb80c033e4074f65a341fc1b3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 24 Nov 2023 11:56:13 +0800
Subject: [PATCH] 匹配
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index c1781b7..8fe8066 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -47,6 +47,7 @@
a.*,
b.name,
b.bind_phone bindPhone,
+ b.account_login accountLogin,
c.pay_method payMethod,
b.phone,
d.name fromMemberName
@@ -56,6 +57,9 @@
left join mall_member d on d.id = a.rt_member_id
<where>
<if test="record != null" >
+ <if test="record.accountLogin!=null and record.accountLogin!=''">
+ and b.account_login like concat('%', #{record.accountLogin},'%')
+ </if>
<if test="record.name!=null and record.name!=''">
and b.name like concat('%', #{record.name},'%')
</if>
@@ -63,7 +67,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},'%')
@@ -83,12 +87,16 @@
a.remark remark,
a.status status,
b.name,
+ b.account_login accountLogin,
b.bind_phone bindPhone,
b.phone
from mall_member_withdraw a
inner join mall_member b on a.member_id=b.id
<where>
<if test="record != null" >
+ <if test="record.accountLogin!=null and record.accountLogin!=''">
+ and b.account_login like concat('%', #{record.accountLogin},'%')
+ </if>
<if test="record.name!=null and record.name!=''">
and b.name like concat('%', #{record.name},'%')
</if>
@@ -123,7 +131,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>
@@ -195,4 +203,50 @@
where a.order_no = #{record.orderNo}
order by a.CREATED_TIME desc
</select>
+
+ <select id="selectMoneyFlowByMemberIdAndIsRetrun" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ SELECT
+ *
+ FROM
+ mall_money_flow a
+ WHERE
+ a.type = 26
+ AND a.flow_type = 6
+ AND a.is_return = #{isReturn}
+ AND a.member_id = #{memberId}
+ ORDER BY
+ a.created_time ASC
+ </select>
+
+ <update id="updateRemarkById">
+ update mall_money_flow
+ <set>
+ remark = #{remark}
+ </set>
+ WHERE id = #{id}
+ </update>
+
+ <update id="updateRemarkAndIsReturnById">
+ update mall_money_flow
+ <set>
+ remark = #{remark},
+ is_return = 1
+ </set>
+ WHERE id = #{id}
+ </update>
+
+ <select id="selectByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ SELECT
+ *
+ FROM
+ mall_money_flow a
+ WHERE
+ a.type = 25
+ AND a.flow_type = 5
+ AND a.is_return = #{isReturn}
+ AND a.member_id = #{memberId}
+ AND a.order_no = #{orderNo}
+ ORDER BY
+ a.created_time ASC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1