From bbe56bf9f6e66b3c1d0085838a6c16b76b0924f5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 01 Oct 2021 20:36:58 +0800
Subject: [PATCH] add reset pwd

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 58c1e6b..0949c74 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -10,9 +10,13 @@
     <select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
         select
             a.*,
-            b.phone
+            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
         from mall_money_flow a
-            inner join mall_member b on a.member_id=b.id
+            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'
         <where>
             <if test="record.type == 3">
                 and a.amount > 0
@@ -31,11 +35,13 @@
         select
         a.*,
         b.name,
+        b.bind_phone bindPhone,
+        c.pay_method payMethod,
         b.phone
         from mall_money_flow a
         inner join mall_member b on a.member_id=b.id
+        left join mall_order_info c on a.order_no = c.order_no
         <where>
-            a.type != 6
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
@@ -55,6 +61,7 @@
         select
         a.*,
         b.name,
+        b.bind_phone bindPhone,
         b.phone
         from mall_money_flow a
         inner join mall_member b on a.member_id=b.id
@@ -74,4 +81,21 @@
         </where>
         order by a.created_time desc
     </select>
+
+    <select id="selectMoneyFlowProfitByDate" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        select a.member_id, sum(a.amount) amount from mall_money_flow a
+        where a.type in (1, 2) and date_format(a.created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+        and is_return is null
+        group by a.member_id;
+    </select>
+
+    <update id="updateIsReturnByMemberId">
+        update mall_money_flow
+        set is_return=#{isReturn}
+        where member_id=#{memberId} and type in (1, 2)
+    </update>
+
+    <select id="selectProfitByDateAndMemberId" resultType="java.math.BigDecimal">
+        select ifnull(sum(a.amount),0) from mall_money_flow a where member_id=#{memberId} and type in (1,2) and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1