公会-后台-公会钻石流水-增加会长地区和操作人

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

@@ -13,6 +13,10 @@ public class GuildDiamondStatisticsDayVo {
     private String guildName;
     @ExcelProperty("公会长id")
     private Long ownerErbanNo;
+    @ExcelProperty("公会长地区")
+    private String ownerRegionDesc;
+    @ExcelProperty("公会操作人")
+    private String adminUsername;
     @ExcelProperty("主播人数")
     private Integer memberNum;
     @ExcelProperty("钻石流水")

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

@@ -18,11 +18,14 @@
         ANY_VALUE(g.name) guildName,
         sum(gd.diamond_num) diamondNum,
         ANY_VALUE(u.erban_no) ownerErbanNo,
+        ANY_VALUE(ri.name) ownerRegionDesc,
+        ANY_VALUE(au.username) adminUsername,
         ifnull(a.memberNum, 0) memberNum
         from guild_diamond_statistics_day gd
-        inner join guild_member gm on gm.id = gd.guild_member_id and gm.`enable` = 1
-        left join guild g on g.id = gm.guild_id and g.`enable` = 1
+        left join guild g on g.id = gd.guild_id
         left join users u on u.uid = g.owner_uid
+        left join region_info ri on ri.id = u.region_id
+        left join admin_user au on au.id = g.admin_id
         left join (select guild_id, count(distinct uid) memberNum from guild_member where `enable` = 1 and role_type != 1 GROUP BY guild_id) a on a.guild_id = g.id
         where gd.stat_date >= #{startDate}
         and gd.stat_date <= #{endDate}