From 0830a387f0c28c2d448714ad184fd0c17bf27ea9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 10:30:50 +0800
Subject: [PATCH] 20210525 回款
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 561d738..8032a52 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -16,6 +16,7 @@
import com.xcong.excoin.common.exception.GlobalException;
import com.xcong.excoin.modules.Sms106Send;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.entity.ActivityReceiveRecord;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
@@ -35,6 +36,7 @@
import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
import com.xcong.excoin.modules.member.service.IMemberService;
+import com.xcong.excoin.modules.member.vo.MemberActivityReceiveVo;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
@@ -2233,14 +2235,14 @@
@Override
public IPage<MemberDataInfoVo> findAllDataInfoListInPage(MemberEntity memberEntity, QueryRequest request) {
String account = memberEntity.getAccount();
- String isTest = memberEntity.getIsTest();
+// String isTest = memberEntity.getIsTest();
//如果account为空，查询全部，account不为空查询对应的memberEntity
if(StrUtil.isNotEmpty(account)) {
memberEntity = memberMapper.selectMemberByAccount(account);
}else {
memberEntity = memberMapper.selectMemberByAccount(MemberEntity.SYSTEM_REFERER);
}
- memberEntity.setIsTest(isTest);
+// memberEntity.setIsTest("");
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.findMemberDataInfoOneAllRealInPage(page, memberEntity);
//USDT充币总额+USDT提币总额
@@ -2306,4 +2308,21 @@
return selectMemberListInPage;
}
+
+ @Override
+ public IPage<MemberActivityReceiveVo> memberActivityReceive(ActivityReceiveRecord activityReceiveRecord,
+ QueryRequest request) {
+
+ Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return memberMapper.memberActivityReceive(page, activityReceiveRecord);
+ }
+
+
+ @Override
+ public IPage<ActivityReceiveRecord> seeReceiveInfo(QueryRequest request,
+ ActivityReceiveRecord activityReceiveRecord) {
+ Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return memberMapper.seeReceiveInfo(page, activityReceiveRecord);
+ }
+
}
--
Gitblit v1.9.1