From f95f10089e8c939c57f6140b960b2e6760067146 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 10:14:05 +0800
Subject: [PATCH] 赠送积分更新状态

---
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 5947756..9b7ada7 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -11,9 +11,8 @@
         select
             a.*
         from mall_money_flow a
-            left join mall_member b on a.rt_member_id=b.id
         <where>
-            1=1 and a.status = 2
+            and a.status = 2
             <if test="record.inOrOut == 3">
                 and a.amount > 0
             </if>
@@ -118,7 +117,8 @@
 
     <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 flow_type =1 and type in (2) and rt_member_id=#{memberId}
+          and status = 2
         <if test="type == 1">
             and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
         </if>
@@ -140,6 +140,11 @@
         where a.order_no = #{rechargeNo} and a.member_id = #{memberId}
     </select>
 
+    <select id="selectOneByOrderNoAndMemberIdAndRtMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        select a.* from mall_money_flow a
+        where a.order_no = #{rechargeNo} and a.member_id = #{memberId} and a.rt_member_id = #{rtMemberId}
+    </select>
+
     <select id="selectAmountByFlowtypeAndType" resultType="java.math.BigDecimal">
         select ifnull(sum(a.amount),0) from mall_money_flow a
         <where>

--
Gitblit v1.9.1