公会-结算-cal-判断活跃主播数

This commit is contained in:
khalil
2025-07-30 14:55:37 +08:00
committed by hokli
parent 9dbf79820f
commit 4add84f2fe

View File

@@ -108,9 +108,10 @@ public class GuildSettleService {
BigDecimal baseSalary = totalDiamondNum.multiply(guildDiamondSalary.getBaseSalaryRatio());
record.setBaseSalary(baseSalary);
record.setActiveMemberBonusRatio(guildDiamondSalary.getActiveMemberBonusRatio());
BigDecimal activeMemberBonusRatio = activeMemberCount >= guildDiamondSalary.getActiveMemberCount()? guildDiamondSalary.getActiveMemberBonusRatio():BigDecimal.ZERO;
record.setActiveMemberBonusRatio(activeMemberBonusRatio);
BigDecimal activeMemberBonus = totalDiamondNum.multiply(guildDiamondSalary.getActiveMemberBonusRatio());
BigDecimal activeMemberBonus = totalDiamondNum.multiply(activeMemberBonusRatio);
record.setActiveMemberBonus(activeMemberBonus);
BigDecimal totalSalary = baseSalary.add(activeMemberBonus);
@@ -138,7 +139,7 @@ public class GuildSettleService {
// 发财
for (GuildSettleRecord record : guildSettleRecords) {
log.info("[guild settle] partitionId {} guildId {} salary {}", record.getPartitionId(), record.getGuildId(), JSON.toJSONString(record));
if (BigDecimal.ZERO.compareTo(record.getTotalSalary()) <= 0) {
if (BigDecimal.ZERO.compareTo(record.getTotalSalary()) >= 0) {
continue;
}
guildUsdOperateService.settlementGold(record.getGuildId(), record.getGuildOwnerUid(), record.getTotalSalary());