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

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

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

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<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);
   }
 

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<FamilyHomeRoomCO> onlineRooms;
 
+  /**
+   * 我的家族权限
+   */
+  private String myFamilyRole;
+
+
 }