From be52ad499cea48f59ff3ebbc3a38792ebd285c07 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 30 Dec 2025 15:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=B4=A2=E5=AF=8C=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/database/rds/dto/family/FamilyMemberExpDTO.java | 5 +++++ .../main/resources/dao/family/FamilyMemberWeekExpDAO.xml | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/dto/family/FamilyMemberExpDTO.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/dto/family/FamilyMemberExpDTO.java index 1c655256..dce4b732 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/dto/family/FamilyMemberExpDTO.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/dto/family/FamilyMemberExpDTO.java @@ -49,4 +49,9 @@ public class FamilyMemberExpDTO implements Serializable { */ private BigDecimal exp; + /** + * 消费金币. + */ + private BigDecimal consumptionGolds; + } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/resources/dao/family/FamilyMemberWeekExpDAO.xml b/rc-service/rc-service-other/other-infrastructure/src/main/resources/dao/family/FamilyMemberWeekExpDAO.xml index afe5f088..0aee8ee5 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/resources/dao/family/FamilyMemberWeekExpDAO.xml +++ b/rc-service/rc-service-other/other-infrastructure/src/main/resources/dao/family/FamilyMemberWeekExpDAO.xml @@ -10,8 +10,10 @@ fm.sys_origin AS sysOrigin, fm.family_id AS family_id, fm.member_user_id AS memberUserId, - fm.member_role AS memberRole + fm.member_role AS memberRole, + IFNULL(ucl.consumption_golds, 0) AS consumptionGolds FROM `family_member` fm + LEFT JOIN user_consumption_level ucl ON fm.member_user_id = ucl.user_id WHERE fm.`family_id` = #{familyId} AND fm.member_user_id = #{memberUserId} @@ -21,7 +23,8 @@ WHEN 'ADMIN' THEN 1 WHEN 'MANAGE' THEN 2 WHEN 'MEMBER' THEN 3 - END + END, + IFNULL(ucl.consumption_golds, 0) DESC LIMIT #{start}, #{end}