From 8313c3536f51c6fe556437bfe81ac874a395969b Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 28 Oct 2025 20:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E8=B4=A1=E7=8C=AE=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=91=A8=E8=B4=A1=E7=8C=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoomContributionActivityQueryCmdExe.java | 35 ++++--------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RoomContributionActivityQueryCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RoomContributionActivityQueryCmdExe.java index 1979e44f..eed666ea 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RoomContributionActivityQueryCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RoomContributionActivityQueryCmdExe.java @@ -45,46 +45,23 @@ public class RoomContributionActivityQueryCmdExe { public RoomContributionCountCO execute(AppRoomIdCmd cmd) { Long roomId = roomProfileManagerService.getRoomId(cmd.getReqUserId()); ResponseAssert.notNull(CommonErrorCode.NOT_FOUND_RECORD_INFO, roomId); - // 是否为请求人自己的房间 - boolean isOwn = Objects.equals(roomId, cmd.getRoomId()); - - // 是否为本周一 - boolean isThisMonday = Objects.equals(ZonedDateTimeAsiaRiyadhUtils.getThisMonday(), - ZonedDateTimeAsiaRiyadhUtils.nowDateToInt()); RoomProfile roomProfile = roomProfileManagerService.getProfileById(cmd.getRoomId()); ResponseAssert.notNull(CommonErrorCode.NOT_FOUND_RECORD_INFO, roomProfile); ResponseAssert.notNull(CommonErrorCode.NOT_FOUND_RECORD_INFO, roomProfile.getId()); - // 获得金币可领取比例 - SysRegionAssistProbabilityDTO activityRatio = getAssistRoomContributionActivityRatio( - roomProfile); - // 非本周且没有领取且积分大于最低领取要求的数据集合 - List activityCounts = roomContributionActivityCountService - .listRoomContribution(cmd.getRoomId(), cmd.requireReqSysOriginEnum()); + RoomContributionActivityCount activityCount = roomContributionActivityCountService.getThisWeekData(cmd.getRoomId()); - ImmutablePair thisWeekData = getThisWeekData(cmd, activityRatio.getRatio()); - if (CollectionUtils.isEmpty(activityCounts)) { + if (activityCount == null) { return new RoomContributionCountCO() - .setThisWeekIntegral(thisWeekData.getLeft()) - .setThisWeekAmount(thisWeekData.getRight()) - .setAvailableAmount(BigDecimal.ZERO) - .setIsNotHighProportion(activityRatio.getRatio().compareTo(BigDecimal.valueOf(0.05)) <= 0) - .setIsShowReceiveButton(Boolean.FALSE) - .setImgUrl(activityRatio.getImgUrl()); + .setThisWeekIntegral(NumUtils.formatLong(0L)) + .setThisWeekAmount(BigDecimal.ZERO); } - // 可领取金额（不含本周） - BigDecimal availableAmount = getAvailableAmount(cmd, activityRatio, activityCounts); return new RoomContributionCountCO() - .setThisWeekIntegral(thisWeekData.getLeft()) - .setThisWeekAmount(thisWeekData.getRight()) - .setAvailableAmount(availableAmount) - .setIsNotHighProportion(activityRatio.getRatio().compareTo(BigDecimal.valueOf(0.05)) <= 0) - .setIsShowReceiveButton( - isOwn && isThisMonday && availableAmount.compareTo(BigDecimal.ZERO) > 0) - .setImgUrl(activityRatio.getImgUrl()); + .setThisWeekIntegral(NumUtils.formatBigDecimal(activityCount.getContributionValue())) + .setThisWeekAmount(activityCount.getContributionValue()); } private BigDecimal getAvailableAmount(AppRoomIdCmd cmd,