diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildsoviet/GuildExtraDiamondDayMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildsoviet/GuildExtraDiamondDayMapper.java index ccfdc1262..1a2a892ac 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildsoviet/GuildExtraDiamondDayMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildsoviet/GuildExtraDiamondDayMapper.java @@ -1,10 +1,12 @@ package com.accompany.business.mybatismapper.guildsoviet; import com.accompany.business.model.guildsoviet.GuildExtraDiamondDay; +import com.accompany.business.vo.guild.GuildInfoVo; 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.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; @@ -46,4 +48,11 @@ public interface GuildExtraDiamondDayMapper extends BaseMapper pageGuildMemberSovietAdminVo(@Param("page") Page page, @Param("guildIdSet") Set guildIdSet, @Param("partitionId") Integer partitionId, @Param("uid") Long uid, @Param("regionId") Integer regionId, @Param("enable") Byte enable, @Param("startDate") String startDate, @Param("endDate") String endDate); + + BigDecimal totalBdGuildDiamondNum(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("bdId")Long bdId); + + Long totalBdGuildCount(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("bdId")Long bdId); + + IPage listBdGuildDiamondNum(@Param("ipage") IPage ipage, @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/BdGuildCenterService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/BdGuildCenterService.java index ae39724b3..b7be034c4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/BdGuildCenterService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/BdGuildCenterService.java @@ -3,8 +3,8 @@ package com.accompany.business.service.guild; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.accompany.business.model.guild.BdInfo; -import com.accompany.business.model.guild.Guild; import com.accompany.business.service.family.FamilyGiftRecordService; +import com.accompany.business.service.guildsoviet.GuildExtraDiamondDayService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.guild.BdGuildCenterVo; import com.accompany.business.vo.guild.GuildInfoVo; @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestHeader; import java.math.BigDecimal; import java.util.Date; @@ -27,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.accompany.common.constant.ApplicationConstant.PublicParameters.PUB_UID; import static java.util.Collections.EMPTY_LIST; @Service @@ -41,6 +39,8 @@ public class BdGuildCenterService { @Autowired private GuildDiamondStatisticsDayService guildDiamondStatisticsDayService; @Autowired + private GuildExtraDiamondDayService guildExtraDiamondDayService; + @Autowired private FamilyGiftRecordService familyGiftRecordService; @@ -73,6 +73,12 @@ public class BdGuildCenterService { Long guildCount = familyGiftRecordService.totalBdFamilyCount(beginTime, endTime, bdId); bdGuildCenterVo.setGuildNum(guildCount); guildInfoVoIPage = familyGiftRecordService.listBdFamilyGoldNum(page, beginTime, endTime, bdId); + } else if (PartitionEnum.SOVIET.getId() == partitionId) { + BigDecimal totalDiamonds = guildExtraDiamondDayService.totalBdGuildDiamondNum(startDate, endDate, bdId); + bdGuildCenterVo.setDiamondNum(totalDiamonds); + Long guildCount = guildExtraDiamondDayService.totalBdGuildCount(startDate, endDate, bdId); + bdGuildCenterVo.setGuildNum(guildCount); + guildInfoVoIPage = guildExtraDiamondDayService.listBdGuildDiamondNum(page, startDate, endDate, bdId); } else { BigDecimal totalDiamonds = guildDiamondStatisticsDayService.totalBdGuildDiamondNum(startDate, endDate, bdId); bdGuildCenterVo.setDiamondNum(totalDiamonds); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildExtraDiamondDayService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildExtraDiamondDayService.java index b835f0e0b..fd89223b9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildExtraDiamondDayService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildsoviet/GuildExtraDiamondDayService.java @@ -2,10 +2,12 @@ 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.GuildInfoVo; 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -79,4 +81,16 @@ public class GuildExtraDiamondDayService extends ServiceImpl listBdGuildDiamondNum(IPage page, String statDate, String endDate, Long bdId) { + return baseMapper.listBdGuildDiamondNum(page, statDate, endDate, bdId); + } + + public BigDecimal totalBdGuildDiamondNum(String statDate, String endDate, Long bdId) { + return baseMapper.totalBdGuildDiamondNum(statDate, endDate, bdId); + } + + public Long totalBdGuildCount(String statDate, String endDate, Long bdId) { + return baseMapper.totalBdGuildCount(statDate, endDate, bdId); + } } diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml index 861079c0e..17df630c9 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml @@ -170,4 +170,43 @@ group by ge.partition_id,ge.stat_date, ge.guild_member_id order by statDate desc + + + + + +