From 58f480d4e4b0e79722a3b6ac20f3b259c410c2d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 26 Oct 2023 14:37:17 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java | 6 +++---
src/main/resources/mapper/modules/ChatUserMapper.xml | 14 ++++++++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java
index 7deec75..f501ddb 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java
@@ -69,6 +69,8 @@
BigDecimal selectTotalType(@Param("type")int i,@Param("dateType") String type, @Param("date") Date date);
+ BigDecimal selectTotalTypeByUserId(@Param("userId")Long userId,@Param("type")int i,@Param("dateType") String type, @Param("date") Date date);
+
List<AdminChatRedBagVo> selectListByMsgType(@Param("userId")Long userId,@Param("msgType")String msgType, @Param("date") Date date);
List<ChatUser> selectUserList(@Param("isRobot")int i,@Param("dateType") String type, @Param("date") Date date);
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 28e7d68..3e4f1b8 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
@@ -60,11 +60,11 @@
adminChatUserPerkVo.setRedBagTotalAmount(redBagTotalAmount);
BigDecimal redBagAvaAmount = group.stream().map(AdminChatRedBagVo::getAmountAva).reduce(BigDecimal.ZERO, BigDecimal::add);
adminChatUserPerkVo.setRedBagAvaAmount(redBagAvaAmount);
- BigDecimal getRedbagAmount = this.baseMapper.selectTotalType(9, null, null);
+ BigDecimal getRedbagAmount = this.baseMapper.selectTotalTypeByUserId(userId,9, null, null);
adminChatUserPerkVo.setGetRedbagAmount(getRedbagAmount);
- BigDecimal boomToAmount = this.baseMapper.selectTotalType(10, null, null);
+ BigDecimal boomToAmount = this.baseMapper.selectTotalTypeByUserId(userId,10, null, null);
adminChatUserPerkVo.setBoomToAmount(boomToAmount);
- BigDecimal teamPerkAmount = this.baseMapper.selectTotalType(7, null, null);
+ BigDecimal teamPerkAmount = this.baseMapper.selectTotalTypeByUserId(userId,7, null, null);
adminChatUserPerkVo.setTeamPerkAmount(teamPerkAmount);
}
}
diff --git a/src/main/resources/mapper/modules/ChatUserMapper.xml b/src/main/resources/mapper/modules/ChatUserMapper.xml
index 150afa0..5847b58 100644
--- a/src/main/resources/mapper/modules/ChatUserMapper.xml
+++ b/src/main/resources/mapper/modules/ChatUserMapper.xml
@@ -360,6 +360,20 @@
</if>
</select>
+
+ <select id="selectTotalTypeByUserId" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0)
+ from chat_amount_flow
+ where type = #{type}
+ and user_id = #{userId}
+ <if test='dateType == "D"'>
+ and date_format(create_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d');
+ </if>
+ <if test='dateType == "M"'>
+ and date_format(create_time, '%Y-%m') = date_format(#{date}, '%Y-%m');
+ </if>
+ </select>
+
<select id="selectUserList" resultType="cc.mrbird.febs.mall.entity.ChatUser">
select
a.*
--
Gitblit v1.9.1