moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会-结算-首页

Browse Source
This commit is contained in:
khalil
2025-07-29 18:28:46 +08:00
committed by hokli
parent face96a9da
commit 61eb198e51
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondSalaryService.java
View File

@@ -71,4 +71,7 @@ public class GuildDiamondSalaryService extends ServiceImpl<GuildDiamondSalaryMap
return map;
}
public BigDecimal calUsdSalary(BigDecimal totalDiamondNum, GuildDiamondSalary diamondSalary) {
return totalDiamondNum.multiply(diamondSalary.getBaseSalaryRatio());
}
}

9
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java
View File

@@ -2,6 +2,7 @@ package com.accompany.business.service.guild;
import com.accompany.business.constant.guild.GuildConstant;
import com.accompany.business.model.UserPurse;
import com.accompany.business.model.guild.GuildDiamondSalary;
import com.accompany.business.model.guild.GuildDiamondWage;
import com.accompany.business.model.guild.GuildMember;
import com.accompany.business.service.purse.UserPurseService;
@@ -53,6 +54,8 @@ public class GuildIncomeService {
private GuildMemberDiamondStatisticsService guildMemberDiamondStatisticsService;
@Autowired
private GuildMemberRoomMicRecordService guildMemberRoomMicRecordService;
@Autowired
private GuildDiamondSalaryService guildDiamondSalaryService;
public GuildIncomeVo getIncome(Long uid) {
Users me = usersService.getNotNullUsersByUid(uid);
@@ -152,9 +155,9 @@ public class GuildIncomeService {
vo.setMemberIncomeList(guildMemberList);
vo.setDiamondNum(totalDiamondNum);
GuildDiamondWage diamondWage = guildDiamondWageService.calDiamondWage(totalDiamondNum, guildMember.getPartitionId());
vo.setDiamondRatio(diamondWage.getWageRatio());
vo.setUsdWage(guildDiamondWageService.calUsdWage(totalDiamondNum, diamondWage));
GuildDiamondSalary diamondSalary = guildDiamondSalaryService.calDiamondSalary(totalDiamondNum, guildMember.getPartitionId());
vo.setDiamondRatio(diamondSalary.getBaseSalaryRatio());
vo.setUsdWage(guildDiamondSalaryService.calUsdSalary(totalDiamondNum, diamondSalary));
return vo;
}

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java
View File

@@ -85,6 +85,8 @@ public class GuildManagerService {
private BdGuildService bdGuildService;
@Autowired
private ApplicationContext applicationContext;
@Autowired
private GuildDiamondSalaryService guildDiamondSalaryService;
@SneakyThrows
public GuildVo getGuildVo(Long uid) {
@@ -153,8 +155,8 @@ public class GuildManagerService {
bizExecutor.execute(()->{
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(),

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSettleService.java
View File

@@ -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);