From f809a03695c5d7b37ea5686e117952b6b5e1e77c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 19 Dec 2025 11:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/GbOrderMapper.xml             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 db5ae4327..701f12e82 100644
--- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
@@ -39,8 +39,10 @@
 
     <select id="getGbOrderPage" 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
+        detail.* ,`order`.ware_id as wareId,`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,`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_detail` detail
         LEFT JOIN gb_order `order` on detail.group_order_no = `order`.group_order_no and `order`.shop_id = #{shopId}