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

添加guildMemberId

Browse Source
This commit is contained in:
hokli
2025-08-05 13:52:23 +08:00
parent 8eb5a9f424
commit 145c527213
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildgame/GameUsdAdminService.java
View File

@@ -39,7 +39,7 @@ public class GameUsdAdminService {
@Autowired
private GameDiamondSalaryService gameDiamondSalaryService;
public BusiResult<PageResult<GameSalaryDetailVo>> detail(Integer partitionId, Long erbanNo, Integer paramGuildId,
public BusiResult<PageResult<GameSalaryDetailVo>> detail(Integer partitionId, Long erbanNo, Integer paramGuildId, Long guildMemberId,
Long ownerErbanNo, String cycleDate, Integer pageNo, Integer pageSize) {
if (partitionId == null) {
throw new AdminServiceException("分区不能为空");
@@ -84,6 +84,7 @@ public class GameUsdAdminService {
wrapper.eq(guildId != null, GameDiamondStatDay::getGuildId, guildId)
.eq(StringUtils.isNotEmpty(cycleDate), GameDiamondStatDay::getCycleDate, cycleDate)
.eq(GameDiamondStatDay::getPartitionId, partitionId)
.eq(guildMemberId != null, GameDiamondStatDay::getGuildMemberId, guildMemberId)
.eq(uid != null, GameDiamondStatDay::getUid, uid);
Page<GameDiamondStatDay> statDays = gameDiamondStatDayService.page(page, wrapper);
List<GameSalaryDetailVo> resultList = new ArrayList<>();

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildgame/GameUsdDetailController.java
View File

@@ -17,8 +17,8 @@ public class GameUsdDetailController {
private GameUsdAdminService gameUsdAdminService;
@GetMapping("/detail")
public BusiResult<PageResult<GameSalaryDetailVo>> detail(Integer partitionId, Long erbanNo, Integer guildId,
public BusiResult<PageResult<GameSalaryDetailVo>> detail(Integer partitionId, Long erbanNo, Integer guildId, Long guildMemberId,
Long ownerErbanNo, String cycleDate, Integer pageNo, Integer pageSize) {
return gameUsdAdminService.detail(partitionId, erbanNo, guildId, ownerErbanNo, cycleDate, pageNo, pageSize);
return gameUsdAdminService.detail(partitionId, erbanNo, guildId, ownerErbanNo, guildMemberId, cycleDate, pageNo, pageSize);
}
}

2
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildgame/GameSalaryDetailVo.java
View File

@@ -6,6 +6,8 @@ import java.math.BigDecimal;
@Data
public class GameSalaryDetailVo {
private Long guildMemberId;
private Integer partitionId;
private String partitionDesc;