From 877881dfd583a847903deb4fbf01715308b75fa8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 18 Dec 2025 18:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/order/vo/GbOrderDetailVO.java       | 4 ++++
 .../czg/service/order/service/impl/GbOrderServiceImpl.java    | 4 ++++
 .../order-service/src/main/resources/mapper/GbOrderMapper.xml | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java
index 35cc48cef..b5c26b72e 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java
@@ -43,6 +43,10 @@ public class GbOrderDetailVO extends GbOrderDetail {
      * 商品拼团价
      */
     private BigDecimal wareGroupPrice;
+    /**
+     * 拼团状态
+     */
+    private String wareGroupStatus;
     /**
      * 店铺地址
      */
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 e3ae8a8e5..45d78e2d9 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
@@ -115,6 +115,9 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
         } else {
             gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
             gbOrderDetail.setGroupOrderNo(groupOrderNo);
+            if (!"ing".equals(gbOrderDetail.getWareGroupStatus())) {
+                throw new CzgException("拼团已结束");
+            }
         }
         List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
         gbOrderDetail.setUsers(users);
@@ -277,6 +280,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
             wareJson.put("wareImgs", ware.getWareImgs());
             wareJson.put("wareDetail", ware.getWareDetail());
             wareJson.put("wareCommentImgs", ware.getWareCommentImgs());
+            wareJson.put("limitBuyNum", ware.getLimitBuyNum());
             order.setWareJson(wareJson.toJSONString());
             order.setWareGroupPrice(ware.getGroupPrice());
             order.setWareOriginalPrice(ware.getOriginalPrice());
diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
index 1648bbc3e..5202832e4 100644
--- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
@@ -92,7 +92,7 @@
     <select id="getDetailByGroupNo" resultType="com.czg.order.vo.GbOrderDetailVO">
         SELECT
             detail.* ,`order`.ware_json as wareJson,`order`.group_end_time as groupEndTime,`order`.group_people_num as groupPeopleNum,`order`.ware_group_price as wareGroupPrice,
-            `order`.ware_original_price as wareOriginalPrice,`user`.nick_name as userName,`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
+            `order`.ware_original_price as wareOriginalPrice,`order`.status as wareGroupStatus,`user`.nick_name as userName,`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
         FROM
             gb_order `order`
             LEFT JOIN gb_order_detail detail on detail.group_order_no = `order`.group_order_no and `detail`.shop_id = #{shopId} and `detail`.user_id = #{userId} and `detail`.is_del = 0