From 3fad99cd41a98d8d41ca19d957309434f306d248 Mon Sep 17 00:00:00 2001 From: khalil Date: Tue, 3 Jun 2025 18:13:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E5=85=AC=E4=BC=9A=E9=92=BB?= =?UTF-8?q?=E7=9F=B3=E8=96=AA=E8=B5=84=E6=B5=81=E6=B0=B4-=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=AC=E4=BC=9A=E9=95=BF=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guild/GuildDiamondStatisticsDayAdminService.java | 5 +++-- .../GuildMemberDiamondStatisticsAdminController.java | 8 +++++--- .../business/vo/guild/AgencyMonthSettleDetailVo.java | 4 +--- .../guild/GuildDiamondStatisticsDayMapper.java | 5 +++-- .../service/guild/GuildDiamondStatisticsDayService.java | 2 +- .../guild/GuildDiamondStatisticsDayServiceImpl.java | 6 ++++-- .../sqlmappers/AgencyMonthSettleDetailMapper.xml | 4 +++- .../sqlmappers/GuildDiamondStatisticsDayMapper.xml | 3 +++ .../sqlmappers/GuildMemberDiamondStatisticsMapper.xml | 4 +++- 9 files changed, 26 insertions(+), 15 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java index 2dcf05d22..a8ab702f2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java @@ -72,7 +72,8 @@ public class GuildDiamondStatisticsDayAdminService { } public IPage listMember(String startDate, String endDate, - int partitionId, Integer guildId, Long erbanNo, Long ownerErbanNo, Integer pageNo, Integer pageSize) { + int partitionId, Integer regionId, + Integer guildId, Long erbanNo, Long ownerErbanNo, Integer pageNo, Integer pageSize) { if (StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate)) { Date date = new Date(); startDate = DateUtil.formatDate(DateUtil.offsetDay(date, -30)); @@ -99,7 +100,7 @@ public class GuildDiamondStatisticsDayAdminService { uid = user.getUid(); } - IPage guildDiamondStatisticsDayPage = guildDiamondStatisticsDayService.listMemberByStatDate(startDate, endDate, partitionId, guildId, uid, pageNo, pageSize); + IPage guildDiamondStatisticsDayPage = guildDiamondStatisticsDayService.listMemberByStatDate(startDate, endDate, partitionId, regionId, guildId, uid, pageNo, pageSize); List records = guildDiamondStatisticsDayPage.getRecords(); if (CollectionUtils.isEmpty(records)) { return guildDiamondStatisticsDayPage; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildMemberDiamondStatisticsAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildMemberDiamondStatisticsAdminController.java index 4e2af3987..f579ad82c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildMemberDiamondStatisticsAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildMemberDiamondStatisticsAdminController.java @@ -31,6 +31,7 @@ public class GuildMemberDiamondStatisticsAdminController { @ApiImplicitParams({ @ApiImplicitParam(name = "partitionId", value = "分区id", required = true), + @ApiImplicitParam(name = "regionId", value = "地区id"), @ApiImplicitParam(name = "erbanNo", value = "主播id"), @ApiImplicitParam(name = "ownerErbanNo", value = "公会长id"), @ApiImplicitParam(name = "guildId", value = "公会id"), @@ -41,14 +42,15 @@ public class GuildMemberDiamondStatisticsAdminController { }) @ApiOperation(value = "公会主播钻石流水列表", httpMethod = "GET") @GetMapping("") - public BaseResponseVO> listMember(BasePageParams basePageParams, Integer partitionId, + public BaseResponseVO> listMember(BasePageParams basePageParams, Integer guildId, Long erbanNo, Long ownerErbanNo) { return new BaseResponseVO<>(guildDiamondStatisticsDayAdminService.listMember(basePageParams.getStartTime(), basePageParams.getEndTime(), - partitionId, guildId, erbanNo, ownerErbanNo, basePageParams.getPageNo(), basePageParams.getPageSize())); + basePageParams.getPartitionId(), basePageParams.getRegionId(), guildId, erbanNo, ownerErbanNo, basePageParams.getPageNo(), basePageParams.getPageSize())); } @ApiImplicitParams({ @ApiImplicitParam(name = "partitionId", value = "分区id", required = true), + @ApiImplicitParam(name = "regionId", value = "地区id"), @ApiImplicitParam(name = "erbanNo", value = "主播id"), @ApiImplicitParam(name = "ownerErbanNo", value = "公会长id"), @ApiImplicitParam(name = "guildId", value = "公会id"), @@ -66,7 +68,7 @@ public class GuildMemberDiamondStatisticsAdminController { // 这里URLEncoder.encode可以防止中文乱码 String excelName = URLEncoder.encode("公会主播钻石流水列表", StandardCharsets.UTF_8); IPage list = guildDiamondStatisticsDayAdminService.listMember(basePageParams.getStartTime(), basePageParams.getEndTime(), - basePageParams.getPartitionId(), guildId, erbanNo, ownerErbanNo, 1, -1); + basePageParams.getPartitionId(), basePageParams.getRegionId(), guildId, erbanNo, ownerErbanNo, 1, -1); response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue()); EasyExcel.write(response.getOutputStream(), GuildMemberDiamondStatisticsDayVo.class).sheet("公会主播钻石流水列表").doWrite(list.getRecords()); } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyMonthSettleDetailVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyMonthSettleDetailVo.java index eb5f3066c..e456d1ff7 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyMonthSettleDetailVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyMonthSettleDetailVo.java @@ -38,8 +38,6 @@ public class AgencyMonthSettleDetailVo { @ExcelProperty("公会长薪资比例") public Double salaryRate; @ExcelIgnore - public Byte region; - @ExcelIgnore public Date createTime; @ExcelIgnore public Date updateTime; @@ -53,5 +51,5 @@ public class AgencyMonthSettleDetailVo { @ExcelProperty("公会长ID") public Long agencyErbanNo; @ExcelIgnore - public String agencyMarkRegion; + public String agencyRegionName; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildDiamondStatisticsDayMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildDiamondStatisticsDayMapper.java index 7f1a3faaf..128788ba2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildDiamondStatisticsDayMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildDiamondStatisticsDayMapper.java @@ -33,8 +33,9 @@ public interface GuildDiamondStatisticsDayMapper extends BaseMapper listMemberByStatDate(@Param("ipage") IPage ipage, - @Param("startDate")String startDate, @Param("endDate")String endDate, - @Param("guildId") Integer guildId, @Param("uid") Long uid, @Param("partitionId") Integer partitionId); + @Param("startDate")String startDate, @Param("endDate")String endDate, + @Param("guildId") Integer guildId, @Param("uid") Long uid, + @Param("partitionId") Integer partitionId, @Param("regionId") Integer regionId); BigDecimal totalBdGuildDiamondNum(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("bdId")Long bdId); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java index 3db64a1b4..333e1af06 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java @@ -26,7 +26,7 @@ public interface GuildDiamondStatisticsDayService extends IService listByStatDate(String statDate, String endDate, Integer partitionId, Integer regionId, Integer guildId, Integer pageNo, Integer pageSize, Long inviteUid); - IPage listMemberByStatDate(String statDate, String endDate, int partitionId, Integer guildId, Long uid, Integer pageNo, Integer pageSize); + IPage listMemberByStatDate(String statDate, String endDate, int partitionId, Integer regionId, Integer guildId, Long uid, Integer pageNo, Integer pageSize); IPage listBdGuildDiamondNum(IPage page, String statDate, String endDate, Long bdId); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayServiceImpl.java index d2bd5d7bb..16b388ac2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayServiceImpl.java @@ -45,9 +45,11 @@ public class GuildDiamondStatisticsDayServiceImpl extends ServiceImpl listMemberByStatDate(String statDate, String endDate, int partitionId, Integer guildId, Long uid, Integer pageNo, Integer pageSize) { + public IPage listMemberByStatDate(String statDate, String endDate, + int partitionId, Integer regionId, + Integer guildId, Long uid, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); - return baseMapper.listMemberByStatDate(page, statDate, endDate, guildId, uid, partitionId); + return baseMapper.listMemberByStatDate(page, statDate, endDate, guildId, uid, partitionId, regionId); } @Override diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AgencyMonthSettleDetailMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AgencyMonthSettleDetailMapper.xml index 7f89102fb..2fe6ea197 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AgencyMonthSettleDetailMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AgencyMonthSettleDetailMapper.xml @@ -33,14 +33,16 @@ u.erban_no agencyErbanNo , h.id agencyId , h.name agencyName , + ri.name agencyRegionName, amsd.hall_member_count hallMemberCount, - amsd.diamond_num energyValue, + ifnull(amsd.diamond_num,0) energyValue, amsd.hall_salary hallSalary, amsd.salary_rate salaryRate from agency_month_settle_detail amsd inner join users u on amsd.uid = u.uid inner join guild h on amsd.guild_id = h.id inner join users gu on h.owner_uid = gu.uid + left join region_info ri on gu.region_id = ri.id where amsd.stat_date = #{dateCycle} and amsd.guild_id = #{guildId} diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml index 1776cd247..c50990e77 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml @@ -77,6 +77,9 @@ and gm.uid = #{uid} + + and u.region_id = #{regionId} + group by gm.id,gm.guild_id, gm.uid ORDER BY gm.`enable` desc, diamondNum desc, gm.guild_id desc diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml index 9350bd649..aba291b01 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml @@ -84,7 +84,8 @@ h.name agencyName , h.owner_uid uid, u.erban_no agencyErbanNo, - sum(IFNULL(diamond_num, 0)) energyValue + ri.name agencyRegionName, + IFNULL(sum(diamond_num), 0) energyValue from guild_member hm left join guild_member_diamond_statistics ed on ed.guild_member_id = hm.id and hm.guild_id = ed.guild_id @@ -92,6 +93,7 @@ inner join guild h on hm.guild_id = h.id left join users u on hm.uid = u.uid inner join users gu on h.owner_uid = gu.uid + left join region_info ri on gu.region_id = ri.id where hm.`enable` = 1 and hm.guild_id = #{guildId}