From ab90c26311bedb788b50e2f95d2ffba572704093 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: Thu, 4 Dec 2025 20:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8B=BC=E5=9B=A2ID=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CombinationController.java     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/fightwine-front/src/main/java/com/yzt/front/controller/CombinationController.java b/fightwine-front/src/main/java/com/yzt/front/controller/CombinationController.java
index 5073946..acc477a 100644
--- a/fightwine-front/src/main/java/com/yzt/front/controller/CombinationController.java
+++ b/fightwine-front/src/main/java/com/yzt/front/controller/CombinationController.java
@@ -2,6 +2,8 @@ package com.yzt.front.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.yzt.common.model.combination.StoreCombination;
+import com.yzt.common.model.combination.StorePink;
+import com.yzt.common.model.product.StoreProduct;
 import com.yzt.common.page.CommonPage;
 import com.yzt.common.request.ClaimProductRequest;
 import com.yzt.common.request.PageParamRequest;
@@ -10,6 +12,7 @@ import com.yzt.common.response.*;
 import com.yzt.common.result.CommonResult;
 import com.yzt.service.service.StoreCombinationService;
 import com.yzt.service.service.StorePinkService;
+import com.yzt.service.service.StoreProductService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +36,9 @@ public class CombinationController {
     @Autowired
     private StorePinkService storePinkService;
 
+    @Autowired
+    private StoreProductService storeProductService;
+
     /**
      * 拼团首页
      */
@@ -119,4 +125,30 @@ public class CombinationController {
         }
     }
 
+    /**
+     * 根据拼团ID查询商品详情
+     */
+    @ApiOperation(value = "根据拼团ID查询商品详情")
+    @RequestMapping(value = "/product/{pinkId}", method = RequestMethod.GET)
+    public CommonResult<StoreProduct> getProductByPinkId(@PathVariable(value = "pinkId") Integer pinkId) {
+        try {
+            // 根据拼团ID查询拼团信息
+            StorePink storePink = storePinkService.getById(pinkId);
+            if (storePink == null) {
+                return CommonResult.failed("拼团信息不存在");
+            }
+            
+            // 根据商品ID查询商品基本信息
+            StoreProduct storeProduct = storeProductService.getById(storePink.getPid());
+            if (storeProduct == null) {
+                return CommonResult.failed("商品信息不存在");
+            }
+            
+            return CommonResult.success(storeProduct);
+        } catch (Exception e) {
+            log.error("根据拼团ID查询商品详情失败: {}", e.getMessage(), e);
+            return CommonResult.failed(e.getMessage());
+        }
+    }
+
 }