From 621bf2401de2358637cf6ae24444143fd30f598b Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Thu, 25 Dec 2025 11:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/PpPackageController.java    | 8 ++++++++
 .../java/com/czg/controller/admin/GbWareController.java  | 9 +++++++++
 .../service/order/service/impl/GbOrderServiceImpl.java   | 4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java
index af15f1988..a9edfbe40 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java
@@ -89,6 +89,14 @@ public class PpPackageController {
         return CzgResult.success(ppPackageService.getPackagePage(reqVo, true));
     }
 
+    /**
+     * 获取套餐详情
+     */
+    @GetMapping("/detail/{id}")
+    public CzgResult<PpPackageVO> getPackageDetail(@PathVariable Long id, Long shopId) {
+        return CzgResult.success(ppPackageService.getPackageDetail(id, shopId));
+    }
+
     /**
      * 获取套餐推广开关
      * 0: 关闭 1: 开启
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java
index 708d5b98d..74449fbb2 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java
@@ -8,6 +8,7 @@ import com.czg.market.service.GbWareService;
 import com.czg.order.dto.GbOrderQueryParam;
 import com.czg.order.service.GbOrderService;
 import com.czg.order.vo.GbOrderCountVO;
+import com.czg.order.vo.GbWareVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.utils.AssertUtil;
@@ -87,4 +88,12 @@ public class GbWareController {
         AssertUtil.isNull(id, "操作失败,请选择商品");
         return CzgResult.success(wareService.deleteGbWare(id));
     }
+
+    /**
+     * 拼团商品详情
+     */
+    @GetMapping("/ware/detail")
+    public CzgResult<GbWareVO> getWareDetail(@RequestParam Long shopId, @RequestParam Long wareId) {
+        return CzgResult.success(gbOrderService.getWareDetail(shopId, wareId, null));
+    }
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
index e1ab54190..a4b7e8aa3 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
@@ -151,7 +151,9 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
                         q.eq(GbOrderDetail::getStatus, "待成团").or(GbOrderDetail::getStatus).eq("退款中");
                     });
             queryWrapper1.eq(GbOrderDetail::getGroupOrderNo, ing.getGroupOrderNo());
-            queryWrapper1.eq(GbOrderDetail::getUserId, userId);
+            if (userId != null) {
+                queryWrapper1.eq(GbOrderDetail::getUserId, userId);
+            }
             boolean exists = detailService.exists(queryWrapper1);
             if (exists) {
                 continue;