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}