From ec07bb6a14335d545b82f230ea395c4a7afc5e1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Dec 2021 14:54:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 1f56fbd..be0d026 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,7 +3,9 @@
<mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper">
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
- SELECT * FROM mall_member m
+ SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance FROM mall_member m
+ left join mall_member a on m.referrer_id = a.invite_id
+ LEFT JOIN mall_member_wallet c on c.member_id = m.id
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -250,4 +252,54 @@
where a.id = #{id} and d.type = 'AGENT_LEVEL'
GROUP BY a.id
</select>
+
+ <select id="getMallDataListInPage" resultType="cc.mrbird.febs.mall.vo.MallDataVo">
+ SELECT
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') createdTime,
+ IFNULL(t1.tol, 0) *- 1 AS payMoney,
+ IFNULL(t2.to2, 0) AS refundMoney,
+ IFNULL(t3.to3, 0) *- 1 AS rewordMoney,
+ (
+ (IFNULL(t1.tol, 0)*- 1) - (IFNULL(t2.to2, 0)) + (IFNULL(t3.to3, 0)*- 1)
+ ) AS surplusMoney
+ FROM
+ mall_money_flow a
+ LEFT JOIN (
+ SELECT
+ b.CREATED_TIME,
+ IFNULL(SUM(b.amount), 0) AS tol
+ FROM
+ mall_money_flow b
+ WHERE
+ b.type = 3
+ GROUP BY
+ DATE_FORMAT(b.CREATED_TIME, '%Y-%m-%d')
+ ) t1 ON DATE_FORMAT(t1.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ LEFT JOIN (
+ SELECT
+ c.CREATED_TIME,
+ IFNULL(SUM(c.amount), 0) AS to2
+ FROM
+ mall_money_flow c
+ WHERE
+ c.type = 4
+ GROUP BY
+ DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d')
+ ) t2 ON DATE_FORMAT(t2.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ LEFT JOIN (
+ SELECT
+ d.CREATED_TIME,
+ IFNULL(SUM(d.amount), 0) AS to3
+ FROM
+ mall_money_flow d
+ WHERE
+ d.type IN (1, 2)
+ GROUP BY
+ DATE_FORMAT(d.CREATED_TIME, '%Y-%m-%d')
+ ) t3 ON DATE_FORMAT(t3.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ GROUP BY
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ ORDER BY
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1