CIS公会钻石

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildsoviet/GuildSovietAdminService.java

@@ -0,0 +1,55 @@
+package com.accompany.admin.service.guildsoviet;
+
+import com.accompany.business.service.guildsoviet.GuildExtraDiamondDayService;
+import com.accompany.business.service.guildsoviet.RoomExtraDiamondDayService;
+import com.accompany.business.service.user.UsersService;
+import com.accompany.business.vo.guildsoviet.GuildMemberSovietAdminVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietAdminVo;
+import com.accompany.common.result.PageResult;
+import com.accompany.core.exception.AdminServiceException;
+import com.accompany.core.model.Users;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GuildSovietAdminService {
+    @Autowired
+    private GuildExtraDiamondDayService guildExtraDiamondDayService;
+    @Autowired
+    private RoomExtraDiamondDayService roomExtraDiamondDayService;
+    @Autowired
+    private UsersService usersService;
+
+    public PageResult<GuildSovietAdminVo> listGuildSovietAdminVo(Integer partitionId, Integer guildId, Long erbanNo,
+                                                                 Integer regionId, String startDate, String endDate,
+                                                                 Integer pageNo, Integer pageSize) {
+        Long uid = null;
+        if (erbanNo != null) {
+            Users user = usersService.getUserByErbanNo(erbanNo);
+            if (user == null) {
+                throw new AdminServiceException("公会长ID不存在");
+            }
+            uid = user.getUid();
+        }
+        Page<GuildSovietAdminVo> guildSovietAdminVoPage =
+                guildExtraDiamondDayService.pageGuildSovietAdminVo(new Page<>(pageNo, pageSize), partitionId, guildId, uid, regionId, startDate, endDate);
+        return new PageResult<>(guildSovietAdminVoPage);
+    }
+
+
+    public PageResult<GuildMemberSovietAdminVo> listGuildMemberSovietAdminVo(Integer partitionId, Byte ebable, Long erbanNo, Integer regionId, String startDate, String endDate,
+                                                                             Integer pageNo, Integer pageSize) {
+        Long uid = null;
+        if (erbanNo != null) {
+            Users user = usersService.getUserByErbanNo(erbanNo);
+            if (user == null) {
+                throw new AdminServiceException("公会长ID不存在");
+            }
+            uid = user.getUid();
+        }
+        Page<GuildMemberSovietAdminVo> guildSovietAdminVoPage =
+                guildExtraDiamondDayService.pageGuildMemberSovietAdminVo(new Page<>(pageNo, pageSize), partitionId, uid, regionId, ebable, startDate, endDate);
+        return new PageResult<>(guildSovietAdminVoPage);
+    }
+}

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsoviet/GuildSovietAdminController.java

@@ -0,0 +1,93 @@
+package com.accompany.admin.controller.guildsoviet;
+
+import com.accompany.admin.service.guildsoviet.GuildSovietAdminService;
+import com.accompany.business.vo.guildsoviet.GuildMemberSovietAdminVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietAdminVo;
+import com.accompany.common.result.PageResult;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+@Api(tags = "CIS公会/主播" , value = "CIS公会/主播")
+@RestController
+@RequestMapping(value = "/admin/guildSoviet")
+public class GuildSovietAdminController {
+
+    @Autowired
+    private GuildSovietAdminService guildSovietAdminService;
+
+    @ApiOperation(value = "CIS公会钻石" , httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guildId" , value = "公会id" , required = true, dataType = "Byte"),
+            @ApiImplicitParam(name = "erbanNo" , value = "公会长ID" , required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "regionId" , value = "公会国家" , required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "startDate" , value = "开始时间" , required = true, dataType = "String"),
+            @ApiImplicitParam(name = "endDate" , value = "结束时间" , required = true, dataType = "String"),
+            @ApiImplicitParam(name = "pageNo" , value = "页码" , required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize" , value = "每页条数" , required = true, dataType = "Integer")
+    })
+    @GetMapping("/list")
+    public PageResult<GuildSovietAdminVo> listGuildSovietAdminVo(@RequestParam(defaultValue = "32") Integer partitionId, Integer guildId, Long erbanNo, Integer regionId,
+                                                                 String startDate, String endDate, Integer pageNo, Integer pageSize) {
+        return guildSovietAdminService.listGuildSovietAdminVo(partitionId, guildId, erbanNo, regionId, startDate, endDate, pageNo, pageSize);
+    }
+
+    @ApiOperation(value = "CIS公会钻石-导出" , httpMethod = "POST")
+    @PostMapping("/export")
+    public void exportGuildSovietAdminVo(HttpServletResponse response, @RequestParam(defaultValue = "32") Integer partitionId,
+                                         Integer guildId, Long erbanNo, Integer regionId, String startDate, String endDate) throws IOException {
+        Integer pageNo = -1;
+        Integer pageSize = -1;
+        PageResult<GuildSovietAdminVo> pageResult = guildSovietAdminService.listGuildSovietAdminVo(partitionId, guildId, erbanNo, regionId, startDate, endDate, pageNo, pageSize);
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        // 这里URLEncoder.encode可以防止中文乱码
+        String excelName = URLEncoder.encode("CIS公会钻石", StandardCharsets.UTF_8);
+        response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue());
+        EasyExcel.write(response.getOutputStream(), GuildSovietAdminVo.class).sheet("CIS公会钻石").doWrite(pageResult.getRows());
+    }
+
+    @ApiOperation(value = "CIS公会成员钻石" , httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "erbanNo" , value = "用户ID" , required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "regionId" , value = "用户国家" , required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "startDate" , value = "开始时间" , required = true, dataType = "String"),
+            @ApiImplicitParam(name = "endDate" , value = "结束时间" , required = true, dataType = "String"),
+            @ApiImplicitParam(name = "enable" , value = "0-无效，1-有效" , required = true, dataType = "Byte"),
+            @ApiImplicitParam(name = "pageNo" , value = "页码" , required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize" , value = "每页条数" , required = true, dataType = "Integer")
+    })
+    @GetMapping("/memberList")
+    public PageResult<GuildMemberSovietAdminVo> listGuildMemberSovietAdminVo(@RequestParam(defaultValue = "32") Integer partitionId, Byte enable, Long erbanNo, Integer regionId,
+                                                                             String startDate, String endDate, Integer pageNo, Integer pageSize) {
+        return guildSovietAdminService.listGuildMemberSovietAdminVo(partitionId, enable, erbanNo, regionId, startDate, endDate, pageNo, pageSize);
+    }
+
+
+    @ApiOperation(value = "CIS公会钻石-导出" , httpMethod = "POST")
+    @PostMapping("/memberExport")
+    public void exportGuildMemberSovietAdminVo(HttpServletResponse response, @RequestParam(defaultValue = "32") Integer partitionId, Byte enable,
+                                               Long erbanNo, Integer regionId, String startDate, String endDate) throws IOException {
+        Integer pageNo = -1;
+        Integer pageSize = -1;
+        PageResult<GuildMemberSovietAdminVo> pageResult = guildSovietAdminService.listGuildMemberSovietAdminVo(partitionId, enable, erbanNo, regionId, startDate, endDate, pageNo, pageSize);
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        // 这里URLEncoder.encode可以防止中文乱码
+        String excelName = URLEncoder.encode("CIS公会成员钻石", StandardCharsets.UTF_8);
+        response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue());
+        EasyExcel.write(response.getOutputStream(), GuildMemberSovietAdminVo.class).sheet("CIS公会成员钻石").doWrite(pageResult.getRows());
+    }
+}

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildsoviet/RoomSovietAdminController.java

@@ -0,0 +1,11 @@
+package com.accompany.admin.controller.guildsoviet;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "CIS房间", value = "CIS房间")
+@RestController
+@RequestMapping(value = "/admin/roomSoviet")
+public class RoomSovietAdminController {
+}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildsoviet/GuildSovietDateListVo.java

@@ -1,32 +0,0 @@
-package com.accompany.business.model.guildsoviet;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Data
-public class GuildSovietDateListVo {
-    @ApiModelProperty("1-个人tab，2-公会tab")
-    private Integer dateType;
-    @ApiModelProperty("当前周期")
-    private GuildSovietDateVo curCycle;
-    @ApiModelProperty("上一周期")
-    private GuildSovietDateVo lastCycle;
-    @ApiModelProperty("今日")
-    private GuildSovietDateVo curDay;
-    @ApiModelProperty("昨日")
-    private GuildSovietDateVo lastDay;
-    @ApiModelProperty("本周")
-    private GuildSovietDateVo curWeek;
-    @ApiModelProperty("上周")
-    private GuildSovietDateVo lastWeek;
-    @ApiModelProperty("本月")
-    private GuildSovietDateVo curMonth;
-    @ApiModelProperty("上月")
-    private GuildSovietDateVo lastMonth;
-}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildsoviet/GuildSovietDateVo.java

@@ -1,26 +0,0 @@
-package com.accompany.business.model.guildsoviet;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Data
-public class GuildSovietDateVo {
-
-    @ApiModelProperty("周期时间范围")
-    private String periodDateStr;
-    @ApiModelProperty("当前周期开始时间")
-    private String beginDate;
-    @ApiModelProperty("当前周期结束时间")
-    private String endDate;
-    @ApiModelProperty("钻石流水")
-    private BigDecimal diamondNum;
-
-}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildsoviet/GuildSovietIncomeAgencyVo.java

@@ -1,14 +0,0 @@
-package com.accompany.business.model.guildsoviet;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class GuildSovietIncomeAgencyVo {
-
-    @ApiModelProperty("周期数据")
-    private GuildSovietDateListVo diamondDateList;
-
-}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildsoviet/GuildSovietIncomePersonVo.java

@@ -1,24 +0,0 @@
-package com.accompany.business.model.guildsoviet;
-
-import com.accompany.business.vo.SimpleUserVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@ApiModel
-@Data
-public class GuildSovietIncomePersonVo {
-
-    @ApiModelProperty("我")
-    private SimpleUserVo me;
-
-    @ApiModelProperty("钻石余额")
-    private BigDecimal diamondNum;
-
-    @ApiModelProperty("周期数据")
-    private GuildSovietDateListVo diamondDateList;
-
-
-}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildsoviet/GuildSovietIncomeVo.java

@@ -1,16 +0,0 @@
-package com.accompany.business.model.guildsoviet;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class GuildSovietIncomeVo {
-
-    @ApiModelProperty("person")
-    private GuildSovietIncomePersonVo person;
-    @ApiModelProperty("agency")
-    private GuildSovietIncomeAgencyVo agency;
-
-}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildsoviet/GuildSovietMemberVo.java

@@ -1,22 +0,0 @@
-package com.accompany.business.model.guildsoviet;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class GuildSovietMemberVo {
-    @ApiModelProperty("统计日期")
-    private String statDate;
-    @ApiModelProperty("角色类型1-公会长，2-管理员，3-主播")
-    private Byte roleType;
-    @ApiModelProperty("0-已退出公会")
-    private Byte enbale;
-    private Long uid;
-    private Long erbanNo;
-    private String nick;
-    private String avatar;
-    @ApiModelProperty("钻石流水")
-    private BigDecimal diamondNum;
-}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildMemberSovietAdminVo.java

@@ -0,0 +1,57 @@
+package com.accompany.business.vo.guildsoviet;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class GuildMemberSovietAdminVo {
+
+    @ExcelIgnore
+    private Integer partitionId;
+
+    @ExcelProperty("日期")
+    @ApiModelProperty("日期")
+    private String statDate;
+
+    @ExcelProperty("公会ID")
+    @ApiModelProperty("公会ID")
+    private Integer guildId;
+
+    @ExcelProperty("用户ID")
+    @ApiModelProperty("用户ID")
+    private Long erbanNo;
+
+    @ExcelProperty("用户UID")
+    @ApiModelProperty("用户UID")
+    private Long uid;
+
+    @ExcelProperty("用户昵称")
+    @ApiModelProperty("用户昵称")
+    private String nick;
+
+    @ExcelProperty("用户国家")
+    @ApiModelProperty("用户国家")
+    private String regionName;
+
+    @ExcelProperty("主播状态 0-无效，1-有效")
+    @ApiModelProperty("主播状态 0-无效，1-有效")
+    private Byte enbale;
+
+    @ExcelProperty("基础收益")
+    @ApiModelProperty("收益")
+    private BigDecimal diamondNum;
+
+    @ExcelProperty("额外收益")
+    @ApiModelProperty("额外收益")
+    private BigDecimal extraDiamondNum;
+
+    @ExcelProperty("公会长额外收益")
+    @ApiModelProperty("公会长额外收益")
+    private BigDecimal guildExtraDiamondNum;
+}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietAdminVo.java

@@ -0,0 +1,54 @@
+package com.accompany.business.vo.guildsoviet;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class GuildSovietAdminVo {
+    @ExcelIgnore
+    @ApiModelProperty()
+    private Integer partitionId;
+
+    @ExcelProperty("日期")
+    @ApiModelProperty("日期")
+    private String statDate;
+
+    @ExcelProperty("公会ID")
+    @ApiModelProperty("公会ID")
+    private Integer guildId;
+
+    @ExcelProperty("公会名称")
+    @ApiModelProperty("公会名称")
+    private String guildName;
+
+    @ExcelProperty("公会长ID")
+    @ApiModelProperty("公会长ID")
+    private Long erbanNo;
+
+    @ExcelProperty("公会长UID")
+    @ApiModelProperty("公会长UID")
+    private Long uid;
+
+    @ExcelProperty("公会长昵称")
+    @ApiModelProperty("公会长昵称")
+    private String nick;
+
+    @ExcelProperty("公会国家")
+    @ApiModelProperty("公会国家")
+    private String guildRegionName;
+
+    @ExcelProperty("公会基础收益")
+    @ApiModelProperty("公会基础收益")
+    private BigDecimal diamondNum;
+
+    @ExcelProperty("公会长额外收益")
+    @ApiModelProperty("公会长额外收益")
+    private BigDecimal extraDiamondNum;
+
+}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietDateListVo.java

@@ -1,4 +1,4 @@
-package com.accompany.business.vo.guild;
+package com.accompany.business.vo.guildsoviet;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietDateVo.java

@@ -1,4 +1,4 @@
-package com.accompany.business.vo.guild;
+package com.accompany.business.vo.guildsoviet;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietIncomeAgencyVo.java

@@ -1,4 +1,4 @@
-package com.accompany.business.vo.guild;
+package com.accompany.business.vo.guildsoviet;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietIncomePersonVo.java

@@ -1,4 +1,4 @@
-package com.accompany.business.vo.guild;
+package com.accompany.business.vo.guildsoviet;
 
 import com.accompany.business.vo.SimpleUserVo;
 import io.swagger.annotations.ApiModel;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietIncomeVo.java

@@ -1,4 +1,4 @@
-package com.accompany.business.vo.guild;
+package com.accompany.business.vo.guildsoviet;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildSovietMemberVo.java

@@ -1,4 +1,4 @@
-package com.accompany.business.vo.guild;
+package com.accompany.business.vo.guildsoviet;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java

@@ -0,0 +1,43 @@
+package com.accompany.business.vo.guildsoviet;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class RoomSovietAdminVo {
+
+    @ExcelIgnore
+    @ApiModelProperty()
+    private Integer partitionId;
+
+    @ExcelProperty("日期")
+    @ApiModelProperty("日期")
+    private String statDate;
+
+    @ExcelProperty("房间ID")
+    @ApiModelProperty("房间ID")
+    private Long erbanNo;
+
+    @ExcelProperty("房主UID")
+    @ApiModelProperty("房主UID")
+    private Long uid;
+
+    @ExcelProperty("房主昵称")
+    @ApiModelProperty("房主昵称")
+    private String nicks;
+
+    @ExcelProperty("房间基础收益")
+    @ApiModelProperty("房间基础收益")
+    private BigDecimal diamondNum;
+
+    @ExcelProperty("房主额外收益")
+    @ApiModelProperty("房主额外收益")
+    private BigDecimal extraDiamondNum;
+
+}

accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildsoviet/GuildExtraDiamondDayMapper.java

@@ -1,7 +1,9 @@
 package com.accompany.business.mybatismapper.guildsoviet;
 
 import com.accompany.business.model.guildsoviet.GuildExtraDiamondDay;
-import com.accompany.business.vo.guild.GuildSovietMemberVo;
+import com.accompany.business.vo.guildsoviet.GuildMemberSovietAdminVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietAdminVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietMemberVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
@@ -36,4 +38,11 @@ public interface GuildExtraDiamondDayMapper extends BaseMapper<GuildExtraDiamond
 
     Page<GuildSovietMemberVo> listMemberDetailVo(@Param("page") Page<GuildSovietMemberVo> page, @Param("partitionId") Integer partitionId, @Param("guildMemberId") Long guildMemberId,
                                                  @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    Page<GuildSovietAdminVo> pageGuildSovietAdminVo(@Param("page") Page<GuildSovietAdminVo> page, @Param("partitionId") Integer partitionId, @Param("guildId") Integer guildId,
+                                                    @Param("uid") Long uid, @Param("regionId") Integer regionId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    Page<GuildMemberSovietAdminVo> pageGuildMemberSovietAdminVo(@Param("page") Page<GuildSovietAdminVo> page, @Param("partitionId") Integer partitionId,
+                                                                @Param("uid") Long uid, @Param("regionId") Integer regionId, @Param("enable") Byte enable,
+                                                                @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildExtraDiamondDayService.java

@@ -2,7 +2,9 @@ package com.accompany.business.service.guildsoviet;
 
 import com.accompany.business.model.guildsoviet.GuildExtraDiamondDay;
 import com.accompany.business.mybatismapper.guildsoviet.GuildExtraDiamondDayMapper;
-import com.accompany.business.vo.guild.GuildSovietMemberVo;
+import com.accompany.business.vo.guildsoviet.GuildMemberSovietAdminVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietAdminVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietMemberVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,4 +60,14 @@ public class GuildExtraDiamondDayService extends ServiceImpl<GuildExtraDiamondDa
         Page<GuildSovietMemberVo> page = new Page<>(pageNo, pageSize, false);
         return baseMapper.listMemberDetailVo(page, partitionId, guildMemberId, beginDate, endDate).getRecords();
     }
+
+    public Page<GuildSovietAdminVo> pageGuildSovietAdminVo(Page<GuildSovietAdminVo> page, Integer partitionId, Integer guildId, Long uid,
+                                                           Integer regionId, String beginDate, String endDate) {
+        return baseMapper.pageGuildSovietAdminVo(page, partitionId, guildId, uid, regionId, beginDate, endDate);
+    }
+
+    public Page<GuildMemberSovietAdminVo> pageGuildMemberSovietAdminVo(Page<GuildSovietAdminVo> page, Integer partitionId, Long uid,
+                                                                       Integer regionId, Byte enable, String beginDate, String endDate) {
+        return baseMapper.pageGuildMemberSovietAdminVo(page, partitionId, uid, regionId, enable, beginDate, endDate);
+    }
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildSovietIncomeService.java

@@ -10,7 +10,7 @@ import com.accompany.business.service.guild.GuildMemberService;
 import com.accompany.business.service.purse.UserPurseService;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.business.util.CycleTimeUtil;
-import com.accompany.business.vo.guild.*;
+import com.accompany.business.vo.guildsoviet.*;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;

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

@@ -46,7 +46,7 @@
         group by partition_id, stat_date,guild_id
     </select>
 
-    <select id="listGuildDetailVo" resultType="com.accompany.business.model.guildsoviet.GuildSovietMemberVo">
+    <select id="listGuildDetailVo" resultType="com.accompany.business.vo.guildsoviet.GuildSovietMemberVo">
         select
             gm.role_type roleType,
             gm.enable enbale,
@@ -66,7 +66,7 @@
         order by diamondNum desc
     </select>
 
-    <select id="listMemberDetailVo" resultType="com.accompany.business.model.guildsoviet.GuildSovietMemberVo">
+    <select id="listMemberDetailVo" resultType="com.accompany.business.vo.guildsoviet.GuildSovietMemberVo">
         select
             gm.role_type roleType,
             u.uid uid,
@@ -85,4 +85,79 @@
         group by ge.partition_id,ge.guild_member_id,ge.stat_date
         order by statDate desc
     </select>
+
+    <select id="pageGuildSovietAdminVo" resultType="com.accompany.business.vo.guildsoviet.GuildSovietAdminVo">
+        select
+            ge.partition_id partitionId,
+            ge.stat_date statDate,
+            ge.guild_id guildId,
+            g.`name` guildName,
+            u.erban_no erbanNo,
+            u.uid uid,
+            u.nick nick,
+            r.`name` guildRegionName,
+            sum(diamond_num + lucky_diamond_num) diamondNum,
+            sum(owner_extra_num + owner_extra_lucky_num) extraDiamondNum
+        from guild_extra_diamond_day ge
+        left join guild g on ge.guild_id = g.id
+        left join users u on g.owner_uid = u.uid
+        left join region_info r on g.region_id = r.id
+        where
+            ge.partition_id = #{partitionId}
+            <if test="guildId != null">
+                and ge.guild_id = #{guildId}
+            </if>
+            <if test="uid != null">
+                and u.uid = #{uid}
+            </if>
+            <if test="regionId != null and regionId != 0">
+                and g.region_id = #{regionId}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                and ge.stat_date >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                and ge.stat_date &lt;= #{endDate}
+            </if>
+        group by ge.partition_id,ge.stat_date, ge.guild_id
+        order by statDate desc
+    </select>
+
+    <select id="pageGuildMemberSovietAdminVo" resultType="com.accompany.business.vo.guildsoviet.GuildMemberSovietAdminVo">
+        select
+            ge.partition_id partitionId,
+            ge.stat_date statDate,
+            gm.guild_id guildId,
+            u.erban_no erbanNo,
+            u.uid uid,
+            u.nick nick,
+            r.`name` regionName,
+            gm.`enable` enbale,
+            sum(diamond_num + lucky_diamond_num) diamondNum,
+            sum(anchor_extra_num + anchor_extra_lucky_num) extraDiamondNum,
+            sum(owner_extra_num + owner_extra_lucky_num) guildExtraDiamondNum
+        from guild_extra_diamond_day ge
+        left join guild_member gm on ge.guild_member_id = gm.id
+        left join users u on ge.uid = u.uid
+        left join region_info r on u.region_id = r.id
+        where
+            ge.partition_id = #{partitionId}
+            <if test="uid != null">
+                and ge.uid = #{uid}
+            </if>
+            <if test="regionId != null and regionId != 0">
+                and u.region_id = #{regionId}
+            </if>
+            <if test="enable != null and enable != -1">
+                and gm.`enable` = #{enable}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                and ge.stat_date >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                and ge.stat_date &lt;= #{endDate}
+            </if>
+        group by ge.partition_id,ge.stat_date, ge.guild_member_id
+        order by statDate desc
+    </select>
 </mapper>

accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guildsoviet/GuildSovietIncomeController.java

@@ -1,8 +1,8 @@
 package com.accompany.business.controller.guildsoviet;
 
 import com.accompany.business.service.guildsoviet.GuildSovietIncomeService;
-import com.accompany.business.vo.guild.GuildSovietIncomeVo;
-import com.accompany.business.vo.guild.GuildSovietMemberVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietIncomeVo;
+import com.accompany.business.vo.guildsoviet.GuildSovietMemberVo;
 import com.accompany.common.annotation.Authorization;
 import com.accompany.common.result.BusiResult;
 import io.swagger.annotations.Api;