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-06-03 18:13:58 +08:00
parent 1df5eb8f6b
commit 3fad99cd41
9 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java
View File

@@ -72,7 +72,8 @@ public class GuildDiamondStatisticsDayAdminService {
}
public IPage<GuildMemberDiamondStatisticsDayVo> 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<GuildMemberDiamondStatisticsDayVo> guildDiamondStatisticsDayPage = guildDiamondStatisticsDayService.listMemberByStatDate(startDate, endDate, partitionId, guildId, uid, pageNo, pageSize);
IPage<GuildMemberDiamondStatisticsDayVo> guildDiamondStatisticsDayPage = guildDiamondStatisticsDayService.listMemberByStatDate(startDate, endDate, partitionId, regionId, guildId, uid, pageNo, pageSize);
List<GuildMemberDiamondStatisticsDayVo> records = guildDiamondStatisticsDayPage.getRecords();
if (CollectionUtils.isEmpty(records)) {
return guildDiamondStatisticsDayPage;

8
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildMemberDiamondStatisticsAdminController.java
View File

@@ -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<IPage<GuildMemberDiamondStatisticsDayVo>> listMember(BasePageParams basePageParams, Integer partitionId,
public BaseResponseVO<IPage<GuildMemberDiamondStatisticsDayVo>> 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<GuildMemberDiamondStatisticsDayVo> 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());
}

4
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyMonthSettleDetailVo.java
View File

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

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildDiamondStatisticsDayMapper.java
View File

@@ -33,8 +33,9 @@ public interface GuildDiamondStatisticsDayMapper extends BaseMapper<GuildDiamond
@Param("inviteUid") Long inviteUid);
IPage<GuildMemberDiamondStatisticsDayVo> listMemberByStatDate(@Param("ipage") IPage<GuildMemberDiamondStatisticsDayVo> 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);

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

@@ -26,7 +26,7 @@ public interface GuildDiamondStatisticsDayService extends IService<GuildDiamondS
Page<GuildDiamondStatisticsDayVo> listByStatDate(String statDate, String endDate, Integer partitionId, Integer regionId,
Integer guildId, Integer pageNo, Integer pageSize, Long inviteUid);
IPage<GuildMemberDiamondStatisticsDayVo> listMemberByStatDate(String statDate, String endDate, int partitionId, Integer guildId, Long uid, Integer pageNo, Integer pageSize);
IPage<GuildMemberDiamondStatisticsDayVo> listMemberByStatDate(String statDate, String endDate, int partitionId, Integer regionId, Integer guildId, Long uid, Integer pageNo, Integer pageSize);
IPage<GuildInfoVo> listBdGuildDiamondNum(IPage<GuildInfoVo> page, String statDate, String endDate, Long bdId);

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

@@ -45,9 +45,11 @@ public class GuildDiamondStatisticsDayServiceImpl extends ServiceImpl<GuildDiamo
}
@Override
public IPage<GuildMemberDiamondStatisticsDayVo> listMemberByStatDate(String statDate, String endDate, int partitionId, Integer guildId, Long uid, Integer pageNo, Integer pageSize) {
public IPage<GuildMemberDiamondStatisticsDayVo> listMemberByStatDate(String statDate, String endDate,
int partitionId, Integer regionId,
Integer guildId, Long uid, Integer pageNo, Integer pageSize) {
IPage<GuildMemberDiamondStatisticsDayVo> 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

4
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AgencyMonthSettleDetailMapper.xml
View File

@@ -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}
<if test="guildId != null">
and amsd.guild_id = #{guildId}

3
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml
View File

@@ -77,6 +77,9 @@
<if test="uid != null">
and gm.uid = #{uid}
</if>
<if test="regionId != null">
and u.region_id = #{regionId}
</if>
group by gm.id,gm.guild_id, gm.uid
ORDER BY gm.`enable` desc, diamondNum desc, gm.guild_id desc
</select>

4
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml
View File

@@ -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
<if test="guildId != null">
and hm.guild_id = #{guildId}