公会钻石流水分区

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

@@ -9,6 +9,7 @@ import com.accompany.business.service.user.UsersService;
 import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo;
 import com.accompany.business.vo.guild.GuildMemberDiamondStatisticsDayVo;
 import com.accompany.common.status.BusiStatus;
+import com.accompany.core.enumeration.PartitionEnum;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.PartitionInfo;
 import com.accompany.core.model.Users;
@@ -62,9 +63,8 @@ public class GuildDiamondStatisticsDayAdminService {
         Page<GuildDiamondStatisticsDayVo> guildDiamondStatisticsDayPage =
                 guildDiamondStatisticsDayService.listByStatDate(startDate, endDate, partitionId, guildId, pageNo, pageSize, inviteUid);
         if (!CollectionUtils.isEmpty(guildDiamondStatisticsDayPage.getRecords())) {
-            PartitionInfo partitionInfo = partitionInfoService.getById(partitionId);
             for (GuildDiamondStatisticsDayVo vo: guildDiamondStatisticsDayPage.getRecords()) {
-                vo.setPartitionDesc(partitionInfo.getDesc());
+                vo.setPartitionDesc(PartitionEnum.getByPartitionId(vo.getPartitionId()).getDesc());
             }
         }
         return guildDiamondStatisticsDayPage;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildDiamondStatisticsDayVo.java

@@ -1,5 +1,6 @@
 package com.accompany.business.vo.guild;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -19,6 +20,8 @@ public class GuildDiamondStatisticsDayVo {
     private String adminUsername;
     @ExcelProperty("主播人数")
     private Integer memberNum;
+    @ExcelIgnore
+    private Integer partitionId;
     @ExcelProperty("钻石流水")
     private Double diamondNum;
 }

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

@@ -9,7 +9,8 @@
         ANY_VALUE(u.erban_no) ownerErbanNo,
         ANY_VALUE(ri.name) ownerRegionDesc,
         ANY_VALUE(au.username) adminUsername,
-        ifnull(a.memberNum, 0) memberNum
+        ifnull(a.memberNum, 0) memberNum,
+        gd.partition_id partitionId
         from guild_diamond_statistics_day gd
         left join guild g on g.id = gd.guild_id
         left join users u on u.uid = g.owner_uid