From 263e2834eae3ceae58da58f9fb622f0fcdcee392 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 30 Dec 2025 14:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=88=91=E7=9A=84=E5=AE=B6=E6=97=8F=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/app/command/SpinsTaskProgressIncrementExe.java | 3 ++- .../other/app/command/SpinsTaskProgressUpdateExe.java | 3 ++- .../circle/other/app/command/family/FamilyHomeListExe.java | 3 +++ .../other/app/dto/clientobject/family/FamilyHomeListCO.java | 6 ++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressIncrementExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressIncrementExe.java index 0e5a383b..f73d4062 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressIncrementExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressIncrementExe.java @@ -5,6 +5,7 @@ import com.red.circle.other.infra.database.rds.dao.task.SpinsTaskConfigDAO; import com.red.circle.other.infra.database.rds.dao.task.SpinsUserTaskProgressDAO; import com.red.circle.other.infra.database.rds.entity.task.SpinsTaskConfig; import com.red.circle.other.infra.database.rds.entity.task.SpinsUserTaskProgress; +import com.red.circle.tool.core.date.ZonedDateTimeAsiaRiyadhUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -144,7 +145,7 @@ public class SpinsTaskProgressIncrementExe { * 获取当前周期key */ private String getCurrentCycleKey(Integer cycleType) { - LocalDate now = LocalDate.now(); + LocalDate now = ZonedDateTimeAsiaRiyadhUtils.now().toLocalDate(); if (cycleType == 1) { // 每日任务：格式 yyyyMMdd return now.format(DateTimeFormatter.ofPattern("yyyyMMdd")); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressUpdateExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressUpdateExe.java index 1d2d700a..8aff27b0 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressUpdateExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressUpdateExe.java @@ -6,6 +6,7 @@ import com.red.circle.other.infra.database.rds.dao.task.SpinsTaskConfigDAO; import com.red.circle.other.infra.database.rds.dao.task.SpinsUserTaskProgressDAO; import com.red.circle.other.infra.database.rds.entity.task.SpinsTaskConfig; import com.red.circle.other.infra.database.rds.entity.task.SpinsUserTaskProgress; +import com.red.circle.tool.core.date.ZonedDateTimeAsiaRiyadhUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -146,7 +147,7 @@ public class SpinsTaskProgressUpdateExe { * 获取当前周期key */ private String getCurrentCycleKey(Integer cycleType) { - LocalDate now = LocalDate.now(); + LocalDate now = ZonedDateTimeAsiaRiyadhUtils.now().toLocalDate(); if (cycleType == 1) { // 每日任务：格式 yyyyMMdd return now.format(DateTimeFormatter.ofPattern("yyyyMMdd")); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java index a16519df..dcb85760 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java @@ -117,6 +117,8 @@ public class FamilyHomeListExe { List onlineRooms = activeVoiceRoomService.listByFamilyId(family.getId(), 30); List roomCOs = buildRoomCOs(onlineRooms); + FamilyMemberInfo myFamilyInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getReqUserId()); + return new FamilyHomeListCO() .setFamilyId(family.getId()) .setFamilyName(family.getFamilyName()) @@ -130,6 +132,7 @@ public class FamilyHomeListExe { .setAvatarFrameCover(levelDetails.getAvatarFrameCover()) .setAvatarFrameSvg(levelDetails.getAvatarFrameSvg()) .setDisplayMembers(displayMembers) + .setMyFamilyRole(Optional.ofNullable(myFamilyInfo).map(FamilyMemberInfo::getMemberRole).orElse(null)) .setOnlineRooms(roomCOs); } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyHomeListCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyHomeListCO.java index abe8c74f..f75027a7 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyHomeListCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyHomeListCO.java @@ -82,4 +82,10 @@ public class FamilyHomeListCO implements Serializable { */ private List onlineRooms; + /** + * 我的家族权限 + */ + private String myFamilyRole; + + }