From 0ae314753d74b3e0c9caff0744f50642de5321ce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 27 Oct 2023 14:37:58 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
index 67a2862..514d840 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
@@ -48,17 +48,25 @@
@Override
public IPage<AdminChatUserPerkVo> getUserPerkList(ChatUser chatUser, QueryRequest request) {
Page<AdminChatUserPerkVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ log.info(String.valueOf(chatUser.getIsRobot()));
IPage<AdminChatUserPerkVo> chatUserPerkVoIPage = this.baseMapper.selectUserPerkListInPage(page, chatUser);
List<AdminChatUserPerkVo> records = chatUserPerkVoIPage.getRecords();
if(CollUtil.isNotEmpty(records)){
for(AdminChatUserPerkVo adminChatUserPerkVo : records){
Long userId = adminChatUserPerkVo.getUserId();
List<AdminChatRedBagVo> group = this.baseMapper.selectListByMsgType(userId,"GROUP", null);
- adminChatUserPerkVo.setGroupRedBagNum(CollUtil.isEmpty(group) ? 0 : group.size());
+// adminChatUserPerkVo.setGroupRedBagNum(CollUtil.isEmpty(group) ? 0 : group.size());
BigDecimal redBagTotalAmount = group.stream().map(AdminChatRedBagVo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
adminChatUserPerkVo.setRedBagTotalAmount(redBagTotalAmount);
BigDecimal redBagAvaAmount = group.stream().map(AdminChatRedBagVo::getAmountAva).reduce(BigDecimal.ZERO, BigDecimal::add);
adminChatUserPerkVo.setRedBagAvaAmount(redBagAvaAmount);
+ BigDecimal getRedbagAmount = this.baseMapper.selectTotalTypeByUserId(userId,12, null, null);
+ adminChatUserPerkVo.setGetRedbagAmount(getRedbagAmount);
+ BigDecimal boomToAmount = this.baseMapper.selectTotalTypeByUserId(userId,10, null, null);
+ adminChatUserPerkVo.setBoomToAmount(boomToAmount);
+// BigDecimal boomFromAmount = this.baseMapper.selectTotalTypeByUserId(userId,9, null, null);
+// BigDecimal teamPerkAmount = this.baseMapper.selectTotalTypeByUserId(userId,7, null, null);
+// adminChatUserPerkVo.setTeamPerkAmount(teamPerkAmount.add(boomFromAmount));
}
}
return chatUserPerkVoIPage;
--
Gitblit v1.9.1