From ad9e494c2988dba8de67db82a2f1c51b27b10975 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 18:09:13 +0800
Subject: [PATCH] 20200723 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 2 +-
src/main/resources/mapper/modules/AgentReturnMapper.xml | 11 +++++++++++
src/main/java/com/xcong/excoin/modules/trademanage/mapper/AgentReturnMapper.java | 2 ++
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/AgentReturnMapper.java b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/AgentReturnMapper.java
index 4eb1cc7..943169b 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/AgentReturnMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/AgentReturnMapper.java
@@ -14,4 +14,6 @@
String selectYJByMemberId();
+ String selectYJTestByMemberId();
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
index bd12527..f1d41be 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -396,7 +396,7 @@
List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();
if(records != null && records.size() > 0) {
- String selectYJByMemberId = agentReturnMapper.selectYJByMemberId();
+ String selectYJByMemberId = agentReturnMapper.selectYJTestByMemberId();
for(MemberAccountMoneyChangeEntity accountMoneyChangeEntity : records) {
Long memberId = accountMoneyChangeEntity.getMemberId();
String allAmount = memberAccountMoneyChangeMapper.selectAccountMoneyChangeByMemberId(memberId);
diff --git a/src/main/resources/mapper/modules/AgentReturnMapper.xml b/src/main/resources/mapper/modules/AgentReturnMapper.xml
index ef3bc1e..93df975 100644
--- a/src/main/resources/mapper/modules/AgentReturnMapper.xml
+++ b/src/main/resources/mapper/modules/AgentReturnMapper.xml
@@ -36,5 +36,16 @@
a.referer_id = 8
and FIND_IN_SET('22015141', m.referer_ids)
</select>
+ <select id="selectYJTestByMemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(return_amount), '0') AS amount
+ FROM
+ agent_return a
+ LEFT JOIN member m on m.id = a.member_id
+ WHERE
+ a.referer_id = 8
+ and
+ (a.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10)
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1