From 8b2fbc1b96a99e02837a911e7ada2728fa5309d4 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Fri, 19 Sep 2025 18:49:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E8=81=94=E4=BD=93-=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=94=BF=E7=AD=96V2fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/vo/guild/GuildSovietDateListVo.java | 2 +- .../service/guild/GuildSovietIncomeService.java | 14 +++++++------- .../sqlmappers/GuildExtraDiamondDayMapper.xml | 2 +- .../guild/GuildSovietIncomeController.java | 13 ++++++++++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSovietDateListVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSovietDateListVo.java index c5ab99041..71c20a50a 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSovietDateListVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSovietDateListVo.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; @Data public class GuildSovietDateListVo { @ApiModelProperty("1-个人tab，2-公会tab") - private Integer dateType; + private Integer dataType; @ApiModelProperty("当前周期") private GuildSovietDateVo curCycle; @ApiModelProperty("上一周期") diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSovietIncomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSovietIncomeService.java index ade545a51..4220d4efc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSovietIncomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildSovietIncomeService.java @@ -82,7 +82,7 @@ public class GuildSovietIncomeService { GuildSovietDateListVo diamondDateList = new GuildSovietDateListVo(); vo.setDiamondDateList(diamondDateList); - diamondDateList.setDateType(1); + diamondDateList.setDataType(1); String lastBeginOfMonth = nowZoneDateTime.minusMonths(1).withDayOfMonth(1).format(DateTimeUtil.dateFormatter); String endOfMonth = nowZoneDateTime.plusMonths(1).withDayOfMonth(1).minusDays(1).format(DateTimeUtil.dateFormatter); @@ -103,7 +103,7 @@ public class GuildSovietIncomeService { GuildSovietDateListVo diamondDateList = new GuildSovietDateListVo(); agencyVo.setDiamondDateList(diamondDateList); - diamondDateList.setDateType(2); + diamondDateList.setDataType(2); String lastBeginOfMonth = nowZoneDateTime.minusMonths(1).withDayOfMonth(1).format(DateTimeUtil.dateFormatter); String endOfMonth = nowZoneDateTime.plusMonths(1).withDayOfMonth(1).minusDays(1).format(DateTimeUtil.dateFormatter); @@ -138,7 +138,7 @@ public class GuildSovietIncomeService { .endDate(lastCycleEndDate) .diamondNum(BigDecimal.ZERO) .periodDateStr(lastBeginDateZdt.withHour(0).withMinute(0).withSecond(0).format(DateTimeUtil.datetimeReverseFormatter) - + "~" + lastEndDateZdt.minusDays(1).withHour(23).withMinute(59).withSecond(59).format(DateTimeUtil.datetimeReverseFormatter)) + + "~" + lastEndDateZdt.withHour(23).withMinute(59).withSecond(59).format(DateTimeUtil.datetimeReverseFormatter)) .build(); diamondDateList.setLastCycle(lastCycle); @@ -232,18 +232,18 @@ public class GuildSovietIncomeService { } } - public List getDetailVo(Long uid, String beginDate, String endDate, Integer dateType, + public List getDetailVo(Long uid, String beginDate, String endDate, Integer dataType, Integer pageNo, Integer pageSize) { GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(uid); - if (null == guildMember || dateType == null) { + if (null == guildMember || dataType == null) { throw new ServiceException(BusiStatus.FAMILY_PERMISSION_DENIED); } - if (dateType == 1) { + if (dataType == 1) { return guildExtraDiamondDayService.listMemberDetailVo(guildMember.getPartitionId(), guildMember.getId(), beginDate, endDate, pageNo, pageSize); - } else if (dateType == 2 && GuildConstant.RoleType.OWNER.equals(guildMember.getRoleType())) { + } else if (dataType == 2 && GuildConstant.RoleType.OWNER.equals(guildMember.getRoleType())) { return guildExtraDiamondDayService.listGuildDetailVo(guildMember.getPartitionId(), guildMember.getGuildId(), beginDate, endDate, pageNo, pageSize); } 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 233174f72..a6e859c07 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 @@ -81,7 +81,7 @@ where ge.guild_member_id = #{guildMemberId} and ge.stat_date >= #{startDate} and ge.stat_date <= #{endDate} - group by ge.partition_id,ge.guild_id,ge.stat_date + group by ge.partition_id,ge.guild_member_id,ge.stat_date order by statDate desc diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildSovietIncomeController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildSovietIncomeController.java index 1fb2997dd..a832bd14c 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildSovietIncomeController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildSovietIncomeController.java @@ -6,6 +6,7 @@ import com.accompany.business.vo.guild.GuildSovietMemberVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,13 +31,19 @@ public class GuildSovietIncomeController { return BusiResult.success(vo); } - + @ApiImplicitParams({ + @io.swagger.annotations.ApiImplicitParam(name = "beginDate", value = "开始时间", required = true, dataType = "String"), + @io.swagger.annotations.ApiImplicitParam(name = "endDate", value = "结束时间", required = true, dataType = "String"), + @io.swagger.annotations.ApiImplicitParam(name = "dataType", value = "数据类型1-个人，2-公会", required = true, dataType = "Integer"), + @io.swagger.annotations.ApiImplicitParam(name = "pageNo", value = "页码", required = true, dataType = "Integer"), + @io.swagger.annotations.ApiImplicitParam(name = "pageSize", value = "页大小", required = true, dataType = "Integer") + }) @ApiOperation(value = "获取明细收入情况", httpMethod = "GET") @Authorization @GetMapping("/getDetailVo") - public BusiResult> getDetailVo(@RequestHeader(PUB_UID) Long uid, String beginDate, String endDate, Integer dateType, + public BusiResult> getDetailVo(@RequestHeader(PUB_UID) Long uid, String beginDate, String endDate, Integer dataType, @RequestParam(defaultValue = "1") Integer pageNo, @RequestParam(defaultValue = "20") Integer pageSize) { - List vos = guildSovietIncomeService.getDetailVo(uid, beginDate, endDate, dateType, pageNo, pageSize); + List vos = guildSovietIncomeService.getDetailVo(uid, beginDate, endDate, dataType, pageNo, pageSize); return BusiResult.success(vos); } }