From 0a0ddc2087fa31cafb0589cf5c826f7caef1914e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 08 May 2023 11:36:23 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index a453577..9496864 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -123,7 +123,7 @@
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
- where type in (2,19,20,21,22,23,24,27,28,29,30) and member_id=#{memberId}
+ where flow_type = 1 and type in (1,2,3,4,5,7,16,17) and member_id=#{memberId} and amount > 0
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -195,4 +195,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