diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildgame/GameUsdAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildgame/GameUsdAdminService.java index 60287f787..66f994c41 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildgame/GameUsdAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildgame/GameUsdAdminService.java @@ -39,7 +39,7 @@ public class GameUsdAdminService { @Autowired private GameDiamondSalaryService gameDiamondSalaryService; - public BusiResult> detail(Integer partitionId, Long erbanNo, Integer paramGuildId, + public BusiResult> 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 statDays = gameDiamondStatDayService.page(page, wrapper); List resultList = new ArrayList<>(); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildgame/GameUsdDetailController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildgame/GameUsdDetailController.java index 06e3d144b..4a4cf4caf 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildgame/GameUsdDetailController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildgame/GameUsdDetailController.java @@ -17,8 +17,8 @@ public class GameUsdDetailController { private GameUsdAdminService gameUsdAdminService; @GetMapping("/detail") - public BusiResult> detail(Integer partitionId, Long erbanNo, Integer guildId, + public BusiResult> 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); } } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildgame/GameSalaryDetailVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildgame/GameSalaryDetailVo.java index 59dfa2f37..a8001bad3 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildgame/GameSalaryDetailVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildgame/GameSalaryDetailVo.java @@ -6,6 +6,8 @@ import java.math.BigDecimal; @Data public class GameSalaryDetailVo { + private Long guildMemberId; + private Integer partitionId; private String partitionDesc;