From a19efc45113d7ef19da297ed8638f5d9813c36d0 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 29 Sep 2025 13:09:07 +0800
Subject: [PATCH] =?UTF-8?q?wallet=20=E6=B5=81=E6=B0=B4=E6=96=B0=E5=A2=9Eac?=
 =?UTF-8?q?count?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/FreightBalanceRunningWaterDTO.java    |  5 ++++
 ...tBalanceRunningWaterClientServiceImpl.java | 24 ++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/rc-service/rc-inner-api/wallet-inner/wallet-inner-model/src/main/java/com/red/circle/wallet/inner/model/dto/FreightBalanceRunningWaterDTO.java b/rc-service/rc-inner-api/wallet-inner/wallet-inner-model/src/main/java/com/red/circle/wallet/inner/model/dto/FreightBalanceRunningWaterDTO.java
index 370a089f..badb2ad4 100644
--- a/rc-service/rc-inner-api/wallet-inner/wallet-inner-model/src/main/java/com/red/circle/wallet/inner/model/dto/FreightBalanceRunningWaterDTO.java
+++ b/rc-service/rc-inner-api/wallet-inner/wallet-inner-model/src/main/java/com/red/circle/wallet/inner/model/dto/FreightBalanceRunningWaterDTO.java
@@ -32,6 +32,11 @@ public class FreightBalanceRunningWaterDTO extends DTO {
   @JsonSerialize(using = ToStringSerializer.class)
   private Long id;
 
+  /**
+   * 账号
+   */
+  private String account;
+
   /**
    * 来源系统.
    */
diff --git a/rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/freight/impl/FreightBalanceRunningWaterClientServiceImpl.java b/rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/freight/impl/FreightBalanceRunningWaterClientServiceImpl.java
index 28c18097..07e29325 100644
--- a/rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/freight/impl/FreightBalanceRunningWaterClientServiceImpl.java
+++ b/rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/freight/impl/FreightBalanceRunningWaterClientServiceImpl.java
@@ -1,10 +1,17 @@
 package com.red.circle.wallet.inner.service.freight.impl;
 
+import com.red.circle.other.inner.endpoint.user.user.UserProfileClient;
+import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
+import com.red.circle.wallet.infra.database.rds.entity.freight.FreightBalanceRunningWater;
 import com.red.circle.wallet.infra.database.rds.service.freight.FreightBalanceRunningWaterService;
 import com.red.circle.wallet.inner.convertor.FreightBalanceRunningWaterInnerConvertor;
 import com.red.circle.wallet.inner.model.dto.FreightBalanceRunningWaterDTO;
 import com.red.circle.wallet.inner.service.freight.FreightBalanceRunningWaterClientService;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -20,12 +27,23 @@ public class FreightBalanceRunningWaterClientServiceImpl implements
 
   private final FreightBalanceRunningWaterService freightBalanceRunningWaterService;
   private final FreightBalanceRunningWaterInnerConvertor freightBalanceRunningWaterInnerConvertor;
+  private final UserProfileClient userProfileClient;
 
   @Override
   public List<FreightBalanceRunningWaterDTO> flowByUserId(Long userId, Long lastId) {
-    return freightBalanceRunningWaterInnerConvertor.toListFreightBalanceRunningWaterDTO(
-        freightBalanceRunningWaterService.flowByUserId(userId, lastId)
-    );
+    List<FreightBalanceRunningWater> runningWaters = freightBalanceRunningWaterService.flowByUserId(userId, lastId);
+    List<FreightBalanceRunningWaterDTO> runningWaterDTO = freightBalanceRunningWaterInnerConvertor.toListFreightBalanceRunningWaterDTO(runningWaters);
+
+    Set<Long> acceptUserIdList = runningWaterDTO.stream().map(FreightBalanceRunningWaterDTO::getAcceptUserId).collect(Collectors.toSet());
+    Map<Long, UserProfileDTO> userProfileDTOMap = userProfileClient.mapByUserIds(acceptUserIdList).getBody();
+
+    runningWaterDTO.forEach(dto -> {
+      UserProfileDTO profileDTO = userProfileDTOMap.get(dto.getAcceptUserId());
+      if (profileDTO != null) {
+        dto.setAccount(profileDTO.getAccount());
+      }
+    });
+    return runningWaterDTO;
   }
 
   @Override