红包列表接口新增account字段

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/redpacket/query/QueryRoomRedPacketDetailQryExe.java

@@ -6,6 +6,8 @@ import com.red.circle.other.app.dto.clientobject.RoomRedPacketDetailCO;
 import com.red.circle.other.app.dto.cmd.QueryRoomRedPacketDetailCmd;
 import com.red.circle.other.domain.gateway.RoomRedPacketGateway;
 import com.red.circle.other.domain.gateway.RoomRedPacketRecordGateway;
+import com.red.circle.other.domain.gateway.user.UserProfileGateway;
+import com.red.circle.other.domain.model.user.UserProfile;
 import com.red.circle.other.domain.redpacket.RoomRedPacket;
 import com.red.circle.other.domain.redpacket.RoomRedPacketRecord;
 import com.red.circle.other.infra.database.cache.service.other.RoomRedPacketCacheService;
@@ -14,8 +16,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
+import java.util.*;
-import java.util.Optional;
 
 /**
  * 查询红包详情执行器
@@ -28,6 +29,7 @@ public class QueryRoomRedPacketDetailQryExe {
     private final RoomRedPacketGateway roomRedPacketGateway;
     private final RoomRedPacketRecordGateway roomRedPacketRecordGateway;
     private final RoomRedPacketCacheService roomRedPacketCacheService;
+    private final UserProfileGateway userProfileGateway;
 
     /**
      * 执行查询
@@ -50,6 +52,15 @@ public class QueryRoomRedPacketDetailQryExe {
         boolean grabbed = roomRedPacketCacheService.hasUserGrabbed(packetId, userId);
         detailCO.setGrabbed(grabbed);
 
+        Map<Long, UserProfile> profileMap = userProfileGateway.mapByUserIds(Set.of(detailCO.getUserId()));
+        UserProfile userProfile = profileMap.get(userId);
+        if (userProfile != null) {
+            detailCO.setUserId(userProfile.getId());
+            detailCO.setAccount(userProfile.getAccount());
+            detailCO.setUserName(userProfile.getUserNickname());
+            detailCO.setUserAvatar(userProfile.getUserAvatar());
+        }
+
         // 5. 如果当前用户已领取，设置领取金额
         if (grabbed) {
             Optional<RoomRedPacketRecord> myRecord = records.stream()

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/redpacket/query/QueryRoomRedPacketListQryExe.java

@@ -58,6 +58,7 @@ public class QueryRoomRedPacketListQryExe {
 
                     UserProfile userProfile = profileMap.get(redPacket.getUserId());
                     if (userProfile != null) {
+                        co.setAccount(userProfile.getAccount());
                         co.setUserAvatar(userProfile.getUserAvatar());
                         co.setUserName(userProfile.getUserNickname());
                         co.setUserId(userProfile.getId());

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/RoomRedPacketCO.java

@@ -25,6 +25,11 @@ public class RoomRedPacketCO {
      */
     private Long userId;
 
+    /**
+     * 账号
+     */
+    private String account;
+
     /**
      * 发起人昵称
      */

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/RoomRedPacketDetailCO.java

@@ -21,6 +21,11 @@ public class RoomRedPacketDetailCO {
      */
     private Long userId;
 
+    /**
+     * 账号
+     */
+    private String account;
+
     /**
      * 发起人昵称
      */