From 2da858edbdda7f3be168f8f736ba2a9094513ef3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Oct 2022 11:33:50 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 9bbff4b..df97c48 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
@@ -68,6 +68,7 @@
private final DappBankDao dappBankDao;
// private final DappMemberService dappMemberService;
private final DappMemberAddressDao dappMemberAddressDao;
+ private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -207,8 +208,11 @@
public IPage<DappMemberEntity> selectInPage(DappMemberEntity member, QueryRequest request) {
Page<DappMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
User currentUser = FebsUtil.getCurrentUser();
- if (currentUser.getDeptId() == null) {
- member.setCurrentUser(currentUser.getUserId());
+// if (currentUser.getDeptId() == null) {
+// member.setCurrentUser(currentUser.getUserId());
+// }
+ if(StrUtil.isNotEmpty(currentUser.getDescription())){
+ member.setDescription(currentUser.getDescription());
}
return dappMemberDao.selectInPage(member, page);
}
@@ -606,6 +610,10 @@
int isOnHook = dappMemberEntity.getIsOnHook() == null ? 2 : dappMemberEntity.getIsOnHook();
memberInfoVo.setIsOnHook(isOnHook);
+
+ BigDecimal totalProfit = igtOnHookPlanOrderDao.selectSumProfitByMemberId(memberId);
+ memberInfoVo.setTotalProfit(totalProfit);
+
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
if(ObjectUtil.isEmpty(dappMemberEntity)){
memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
--
Gitblit v1.9.1