diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondSalaryService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondSalaryService.java index 7d52c3b50..f8c0667e0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondSalaryService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondSalaryService.java @@ -71,4 +71,7 @@ public class GuildDiamondSalaryService extends ServiceImpl{ try { //本周期工资 - GuildCycleDiamondWageLevelVo cycleDiamondWageLevelVo = guildDiamondWageService.getCycleDiamondWageLevel(guild.getId(), u.getPartitionId()); - vo.setCycleDiamondWageLevel(cycleDiamondWageLevelVo); + GuildCycleDiamondWageLevelVo cycleDiamondSalaryLevelVo = guildDiamondSalaryService.getCycleDiamondSalaryLevel(guild.getId(), u.getPartitionId()); + vo.setCycleDiamondWageLevel(cycleDiamondSalaryLevelVo); //主播周奖励 GuildMemberWeekLevelRewardVo thisWeekVo = guildMemberWeekLevelRewardService.getThisWeekLevelRewardVo(guildMember.getId(), diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSettleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSettleService.java index 48eca3c88..5ec2a5917 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSettleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSettleService.java @@ -109,7 +109,9 @@ public class GuildSettleService { record.setBaseSalary(baseSalary); record.setActiveMemberBonusRatio(guildDiamondSalary.getActiveMemberBonusRatio()); + BigDecimal activeMemberBonus = totalDiamondNum.multiply(guildDiamondSalary.getActiveMemberBonusRatio()); + record.setActiveMemberBonus(activeMemberBonus); BigDecimal totalSalary = baseSalary.add(activeMemberBonus); record.setTotalSalary(totalSalary);