From c9340a81564b93e329fdbc4a2efb96eef657e6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=9D=A1=E8=A7=89=E7=9A=84=E6=9C=88=E4=BA=AE?=
 <97796069+Cookies-OvO@users.noreply.github.com>
Date: Fri, 5 Dec 2025 10:05:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=92=E9=98=9F=E5=88=97=E8=A1=A8=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../response/StorePinkAdminListResponse.java   |  3 +++
 .../service/impl/StorePinkServiceImpl.java     | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java
index aeaaca9..dea2a33 100644
--- a/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java
+++ b/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java
@@ -47,6 +47,9 @@ public class StorePinkAdminListResponse {
     @ApiModelProperty(value = "拼团商品")
     private String title;
 
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+
     @ApiModelProperty(value = "手机号码")
     private String phone;
 
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
index 410ab42..b780ed8 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
@@ -196,6 +196,16 @@ public class StorePinkServiceImpl extends ServiceImpl<StorePinkMapper, StorePink
         }
         List<Integer> userIds = storePinks.stream().map(StorePink::getUid).collect(Collectors.toList());
         HashMap<Integer, User> userHashMap = userService.getMapListInUid(userIds);
+        
+        // 批量查询商品信息
+        List<Integer> productIds = storePinks.stream().map(StorePink::getPid).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+        Map<Integer, StoreProduct> productMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(productIds)) {
+            List<StoreProduct> products = storeProductService.listByIds(productIds);
+            productMap = products.stream().collect(Collectors.toMap(StoreProduct::getId, p -> p));
+        }
+        
+        Map<Integer, StoreProduct> finalProductMap = productMap;
         List<StorePinkAdminListResponse> list = storePinks.stream().map(pink -> {
             StorePinkAdminListResponse storePinkResponse = new StorePinkAdminListResponse();
             BeanUtils.copyProperties(pink, storePinkResponse);
@@ -212,6 +222,14 @@ public class StorePinkServiceImpl extends ServiceImpl<StorePinkMapper, StorePink
             if(Objects.nonNull(combination)){
                 storePinkResponse.setTitle(combination.getTitle());
             }
+            
+            // 设置商品名称
+            if (pink.getPid() != null) {
+                StoreProduct product = finalProductMap.get(pink.getPid());
+                if (product != null) {
+                    storePinkResponse.setProductName(product.getStoreName());
+                }
+            }
 
             User user = userHashMap.get(pink.getUid());
             if (null != user) {