hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

家族列表增加我的家族权限

Browse Source
This commit is contained in:
tianfeng 2025-12-30 14:34:10 +08:00
parent f4f315bc08
commit 263e2834ea
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressIncrementExe.java
View File

@ -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"));

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/SpinsTaskProgressUpdateExe.java
View File

@ -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"));

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java
View File

@ -117,6 +117,8 @@ public class FamilyHomeListExe {
List<ActiveVoiceRoom> onlineRooms = activeVoiceRoomService.listByFamilyId(family.getId(), 30);
List<FamilyHomeRoomCO> 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);
}

6
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyHomeListCO.java
View File

@ -82,4 +82,10 @@ public class FamilyHomeListCO implements Serializable {
*/
private List<FamilyHomeRoomCO> onlineRooms;
/**
* 我的家族权限
*/
private String myFamilyRole;
}