From e9e2905bfc18dd68562f9e9711ce60f67ec28aa7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Oct 2022 16:05:28 +0800
Subject: [PATCH] 20221020
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 074481e..813b090 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -64,7 +64,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final PlatformBannerMapper platformBannerMapper;
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
- private final DappMemberService dappMemberService;
+ private final DappBankDao dappBankDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -681,7 +681,7 @@
}
@Override
- public List<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
+ public IPage<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
Page<ApiAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -697,7 +697,7 @@
}
dappAccountMoneyChangeEntity.setMemberId(member.getId());
IPage<ApiAmountChangeListVo> records = dappAccountMoneyChangeDao.selectChangeListInPage(page, dappAccountMoneyChangeEntity);
- return records.getRecords();
+ return records;
}
@Override
@@ -770,7 +770,7 @@
}
@Override
- public FebsResponse myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
+ public IPage<ApiMyTeammateInfoListVo> myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
Page<ApiMyTeammateInfoListVo> page = new Page<>(apiMyTeammateInfoDto.getPageNum(), apiMyTeammateInfoDto.getPageSize());
if(ObjectUtil.isEmpty(apiMyTeammateInfoDto.getInviteId())){
@@ -789,7 +789,7 @@
}
}
}
- return new FebsResponse().success().data(apiMyTeammateInfoListVos);
+ return apiMyTeammateInfoListVos;
}
@Override
@@ -807,12 +807,21 @@
}
@Override
- public FebsResponse findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
+ public IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
Page<ApiMyTeammateAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());
apiAmountChangeDto.setInviteId(member.getInviteId());
IPage<ApiMyTeammateAmountChangeListVo> amountChangeList = dappAccountMoneyChangeDao.selectTeammateChangeListInPage(apiAmountChangeDto,page);
- return new FebsResponse().success().data(amountChangeList);
+ return amountChangeList;
+ }
+
+ @Override
+ public IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Page<ApiBankListVo> page = new Page<>(apiBankListDto.getPageNum(), apiBankListDto.getPageSize());
+ apiBankListDto.setMemberId(member.getId());
+ IPage<ApiBankListVo> apiBankListVoIPage = dappBankDao.selectBankListInPage(apiBankListDto,page);
+ return apiBankListVoIPage;
}
public String generateAsaToken(String token) {
--
Gitblit v1.9.1