商品模块代码提交

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, "[]"));
+    }
 }

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-否
      */

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,