From fd7ebd0d7566bdfdf04046da90400b716b87e9f5 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 25 Feb 2025 10:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/product/vo/ShopProductInfoVo.java     | 10 +++++++++-
 .../main/java/com/czg/product/vo/ShopProductVo.java    |  2 +-
 .../src/main/resources/mapper/ProductMapper.xml        |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java
index 5ab7bda0..257236c6 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java
@@ -70,10 +70,14 @@ public class ShopProductInfoVo implements Serializable {
      * 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
      */
     private String type;
+    /**
+     * 套餐内容
+     */
+    private Object groupSnap;
     /**
      * 套餐类型 0-固定套餐 1-可选套餐
      */
-    private String groupType;
+    private Integer groupType;
     /**
      * 是否可售时间 1-是 0-否
      */
@@ -112,4 +116,8 @@ public class ShopProductInfoVo implements Serializable {
     public Object getSelectSpecInfo() {
         return JSON.parseObject(Convert.toStr(selectSpecInfo, "{}"));
     }
+
+    public Object getGroupSnap() {
+        return JSON.parseArray(Convert.toStr(groupSnap, "[]"));
+    }
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
index 50d77cfd..d8934a3a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
@@ -67,7 +67,7 @@ public class ShopProductVo implements Serializable {
     /**
      * 套餐类型 0-固定套餐 1-可选套餐
      */
-    private String groupType;
+    private Integer groupType;
     /**
      * 是否可售时间 1-是 0-否
      */
diff --git a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
index 43a7ae09..83f15b4b 100644
--- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
@@ -89,7 +89,8 @@
                t1.end_time,
                t1.is_hot,
                ifnull(t2.suit_num, 1) as suit_num,
-               t1.select_spec_info
+               t1.select_spec_info,
+               t1.group_snap
         from tb_product t1
                  left join (select x.product_id,
                                    x.id as sku_id,