From f9a05725755a6c6bce047d0798072a762d41dec1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 15:26:14 +0800
Subject: [PATCH] 20200723 代码提交
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 19 ++++++++++++++++++-
src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml | 17 +++++++++++++----
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 82064bb..e3eaa85 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -488,7 +488,24 @@
MemberAccountMoneyChange memberAccountMoneyChange = new MemberAccountMoneyChange();
memberAccountMoneyChange.setMemberId(memberId);
IPage<MemberAccountMoneyChange> list = memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(page, memberAccountMoneyChange);
- Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = MemberAccountMoneyChangeMapper.INSTANCE.pageEntityToPageVo(list);
+ List<MemberAccountMoneyChange> contractRecordList = list.getRecords();
+ List<MemberAccountMoneyChangeInfoVo> arrayList = new ArrayList<>();
+ if(CollUtil.isNotEmpty(contractRecordList)) {
+ if (ObjectUtil.isNotNull(contractRecordList)) {
+ for (MemberAccountMoneyChange memberAccountMoneyChanges : contractRecordList) {
+ MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();
+ memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChanges.getAmount());
+ memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChanges.getContent());
+ memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChanges.getStatus());
+ memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChanges.getSymbol());
+ memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChanges.getType());
+ memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChanges.getUpdateTime());
+ arrayList.add(memberAccountMoneyChangeInfoVo);
+ }
+ }
+ }
+ Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = new Page<>();
+ pageEntityToPageVo.setRecords(arrayList);
return Result.ok(pageEntityToPageVo);
}
diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index a787811..1c47b40 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -14,10 +14,6 @@
select * from member_account_money_change where type = 3 and member_id = #{memberId} order by id desc
</select>
- <select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
- select * from member_account_money_change where type = 3 and content like '%佣金到账%' and member_id = #{memberId} order by id desc
- </select>
-
<select id="selectWalletCoinRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
select * from member_account_money_change
<if test="record != null">
@@ -54,5 +50,18 @@
</if>
order by id desc
</select>
+
+ <select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
+ select * from member_account_money_change <if test="record != null">
+ <where>
+ type = 3
+ and content like '%佣金到账%'
+ <if test="record.memberId != null" >
+ and member_id=#{record.memberId}
+ </if>
+ </where>
+ </if>
+ order by id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1