From 673561c45cf71584d808647e685f6903db0f92b7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 15:15:57 +0800
Subject: [PATCH] 20221221
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f22498a..de38deb 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -73,6 +73,7 @@
a.amount amount,
a.amount_fee amountFee,
a.withdraw_no withdrawNo,
+ a.remark remark,
a.status status,
b.name,
b.bind_phone bindPhone,
@@ -115,7 +116,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>
@@ -131,4 +132,14 @@
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