From 927bef9602e99506f5d889ba96f731426532aa70 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 19 Nov 2024 10:11:37 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index a79c260..d81d89d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1291,6 +1291,9 @@ public class PayService {
         orderInfo.setPaidTime(System.currentTimeMillis());
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
 
+        // 消费送积分
+        tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("token", 0);
         jsonObject.put("type", "wxcreate");

From 5eb1403647c328e8deef064daef6b3de4aa806fc Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 19 Nov 2024 10:24:43 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbProduct.java             | 6 +-----
 src/main/resources/mapper/TbProductMapper.xml               | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
index 6e2d092..14a982d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
@@ -42,7 +42,7 @@ public class TbProduct implements Serializable {
      */
     private String shortTitle;
     /**
-     * 商品类型（属性）:REAL- 实物商品 VIR---虚拟商品
+     * 商品类型（属性）:普通商品 normal 套餐商品 package 称重商品 weigh 团购券商品 coupon
      */
     private String type;
     /**
@@ -104,10 +104,6 @@ public class TbProduct implements Serializable {
      * 是否暂停销售
      */
     private Integer isPauseSale;
-    /**
-     * 是否删除0不删1删除
-     */
-    private Integer isDelete;
 
     private Long createdAt;
 
diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 57f74ee..84e9c14 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -25,7 +25,6 @@
         <result property="isDel" column="is_del" jdbcType="INTEGER"/>
         <result property="isStock" column="is_stock" jdbcType="INTEGER"/>
         <result property="isPauseSale" column="is_pause_sale" jdbcType="INTEGER"/>
-        <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
         <result property="createdAt" column="created_at" jdbcType="INTEGER"/>
         <result property="updatedAt" column="updated_at" jdbcType="INTEGER"/>
         <result property="specTableHeaders" column="spec_table_headers" jdbcType="VARCHAR"/>
@@ -40,7 +39,7 @@
     <sql id="Base_Column_List">
         id
         , category_id, spec_id, merchant_id, shop_id, name, short_title, type, pack_fee, low_price, low_member_price,
-        unit_id, cover_img, images, sort, status, fail_msg, is_hot, type_enum, is_del, is_stock, is_pause_sale, is_delete,
+        unit_id, cover_img, images, sort, status, fail_msg, is_hot, type_enum, is_del, is_stock, is_pause_sale,
         created_at, updated_at,  group_snap, spec_info, select_spec,
         spec_table_headers, group_category_id, real_sales_number, stock_number, is_grounding, is_refund_stock, warn_line  </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -233,7 +232,6 @@
         LEFT JOIN tb_shop_info AS info ON info.id = `order`.shop_id
         <where>
             info.`status`='1'
-#             AND pro.is_combo = '1'
             AND pro.type_enum = 'group'
             AND (info.cities = #{cities} or info.districts = #{cities})
             <if test="proName != null and proName != ''">

From 55adcacc4c884f5b72be3fe1dfbe1b96227ed4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 19 Nov 2024 10:30:14 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E7=83=AD=E9=94=80=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/ProductService.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index db90810..e5fce3f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -257,7 +257,12 @@ public class ProductService {
             //热销
             TbProductGroup hot = new TbProductGroup();
             hot.setName("热销");
-            List<TbProduct> hots = tbProductMapper.selectHot(shopId,proSets);
+            List<TbProduct> hots  = null;
+            if (proSets.isEmpty()) {
+                hots = new ArrayList<>();
+            }else {
+                hots = tbProductMapper.selectHot(shopId,proSets);
+            }
             hot.setProducts(handleDate(hots,true,1,false, shopInfo));
             groupList.add(0, hot);
 

From 0d57d1b8ba6b99a9252e3f03708b29529120f11e Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 19 Nov 2024 15:25:28 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E9=80=81=E7=A7=AF=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 935dac7..0b6a90b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1523,7 +1523,7 @@ public class PayService {
         //充值送积分
         TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount());
         if (ObjectUtil.isNotNull(activate)) {
-            tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftAmount(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftAmount()), null, memberIn.getOrderNo());
+            tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo());
         }
 
         JSONObject jsonObject = new JSONObject();
@@ -1725,7 +1725,7 @@ public class PayService {
         //充值送积分
         TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount());
         if (ObjectUtil.isNotNull(activate)) {
-            tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftAmount(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftAmount()), null, memberIn.getOrderNo());
+            tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo());
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("shopId", memberIn.getShopId());

From d5d063c819cbcdb2bd6f9084f71f2c1559d7dc32 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 19 Nov 2024 16:19:54 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/dao/TbProductMapper.java   |  1 -
 .../cashierservice/entity/TbProduct.java      | 60 ++++++++++++-----
 src/main/resources/mapper/TbProductMapper.xml | 66 +++++++++----------
 3 files changed, 77 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java
index f3850a4..d4ef17a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java
@@ -18,7 +18,6 @@ public interface TbProductMapper {
 
     TbProduct selectById(Integer id);
 
-    List<TbProduct> selectByIdIn(@Param("ids") String ids);
     List<TbProduct> selectByIdInAndCheck(@Param("ids") String ids);
     List<TbProduct> selectHot(@Param("shopId") String shopId,@Param("list")  Set<Integer> proIds);
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
index 14a982d..f69cbcf 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
@@ -3,18 +3,19 @@ package com.chaozhanggui.system.cashierservice.entity;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.io.Serializable;
 
 /**
  * (TbProduct)实体类
  *
  * @author ww
- * @since 2024-11-18 14:41:53
+ * @since 2024-11-19 15:52:20
  */
 @Data
 public class TbProduct implements Serializable {
-    private static final long serialVersionUID = -40921077034892720L;
+    private static final long serialVersionUID = 876918627328411456L;
     /**
      * id
      */
@@ -27,11 +28,6 @@ public class TbProduct implements Serializable {
      * 商品规格
      */
     private Integer specId;
-    /**
-     * 商户Id
-     */
-    private String merchantId;
-
     private String shopId;
     /**
      * 商品名称
@@ -42,7 +38,7 @@ public class TbProduct implements Serializable {
      */
     private String shortTitle;
     /**
-     * 商品类型（属性）:普通商品 normal 套餐商品 package 称重商品 weigh 团购券商品 coupon
+     * 普通商品 normal 套餐商品 package 称重商品 weigh 团购券 coupon
      */
     private String type;
     /**
@@ -76,10 +72,6 @@ public class TbProduct implements Serializable {
      * 0--待审核 1审核通过 -1审核失败  -2违规下架
      */
     private Integer status;
-    /**
-     * 审核失败原因
-     */
-    private String failMsg;
     /**
      * 是否热销
      */
@@ -108,6 +100,10 @@ public class TbProduct implements Serializable {
     private Long createdAt;
 
     private Long updatedAt;
+    /**
+     * 0 固定套餐 1可选套餐
+     */
+    private Integer groupType;
     /**
      * 套餐内容
      */
@@ -148,6 +144,42 @@ public class TbProduct implements Serializable {
      * 库存警戒线
      */
     private Integer warnLine;
+    /**
+     * 堂食 table 自取 dine 配送 delivery 快递 express
+     */
+    private String showType;
+    /**
+     * 称重 价格/千克
+     */
+    private BigDecimal weight;
+    /**
+     * 是否允许临时改价
+     */
+    private Integer isTempPrice;
+    /**
+     * 日销售上限
+     */
+    private Integer dayLimit;
+    /**
+     * 每单销售上限
+     */
+    private Integer singleOrderLimit;
+    /**
+     * 每人销售上限
+     */
+    private Integer singlePeopleLimit;
+    /**
+     * 周 数组 周一,周二,周日
+     */
+    private String days;
+    /**
+     * 可用开始时间
+     */
+    private LocalTime startTime;
+    /**
+     * 可用结束时间
+     */
+    private LocalTime endTime;
 
     private String cartNumber="0";
 
@@ -158,7 +190,5 @@ public class TbProduct implements Serializable {
 
     @Transient
     private TbProductSkuResult productSkuResult;
-
-
 }
 
diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 84e9c14..7372799 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -6,20 +6,17 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="categoryId" column="category_id" jdbcType="VARCHAR"/>
         <result property="specId" column="spec_id" jdbcType="INTEGER"/>
-        <result property="merchantId" column="merchant_id" jdbcType="VARCHAR"/>
         <result property="shopId" column="shop_id" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="shortTitle" column="short_title" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="VARCHAR"/>
-        <result property="packFee" column="pack_fee" jdbcType="DECIMAL"/>
-        <result property="lowPrice" column="low_price" jdbcType="DECIMAL"/>
-        <result property="lowMemberPrice" column="low_member_price" jdbcType="DECIMAL"/>
+        <result property="packFee" column="pack_fee" jdbcType="NUMERIC"/>
+        <result property="lowPrice" column="low_price" jdbcType="NUMERIC"/>
         <result property="unitId" column="unit_id" jdbcType="INTEGER"/>
         <result property="coverImg" column="cover_img" jdbcType="VARCHAR"/>
         <result property="images" column="images" jdbcType="VARCHAR"/>
         <result property="sort" column="sort" jdbcType="INTEGER"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
-        <result property="failMsg" column="fail_msg" jdbcType="VARCHAR"/>
         <result property="isHot" column="is_hot" jdbcType="INTEGER"/>
         <result property="typeEnum" column="type_enum" jdbcType="VARCHAR"/>
         <result property="isDel" column="is_del" jdbcType="INTEGER"/>
@@ -27,6 +24,10 @@
         <result property="isPauseSale" column="is_pause_sale" jdbcType="INTEGER"/>
         <result property="createdAt" column="created_at" jdbcType="INTEGER"/>
         <result property="updatedAt" column="updated_at" jdbcType="INTEGER"/>
+        <result property="groupType" column="group_type" jdbcType="INTEGER"/>
+        <result property="groupSnap" column="group_snap" jdbcType="VARCHAR"/>
+        <result property="specInfo" column="spec_info" jdbcType="VARCHAR"/>
+        <result property="selectSpec" column="select_spec" jdbcType="VARCHAR"/>
         <result property="specTableHeaders" column="spec_table_headers" jdbcType="VARCHAR"/>
         <result property="groupCategoryId" column="group_category_id" jdbcType="VARCHAR"/>
         <result property="realSalesNumber" column="real_sales_number" jdbcType="INTEGER"/>
@@ -34,14 +35,26 @@
         <result property="isGrounding" column="is_grounding" jdbcType="INTEGER"/>
         <result property="isRefundStock" column="is_refund_stock" jdbcType="INTEGER"/>
         <result property="warnLine" column="warn_line" jdbcType="INTEGER"/>
+        <result property="showType" column="show_type" jdbcType="VARCHAR"/>
+        <result property="weight" column="weight" jdbcType="NUMERIC"/>
+        <result property="isTempPrice" column="is_temp_price" jdbcType="INTEGER"/>
+        <result property="dayLimit" column="day_limit" jdbcType="INTEGER"/>
+        <result property="singleOrderLimit" column="single_order_limit" jdbcType="INTEGER"/>
+        <result property="singlePeopleLimit" column="single_people_limit" jdbcType="INTEGER"/>
+        <result property="days" column="days" jdbcType="VARCHAR"/>
+        <result property="startTime" column="start_time" jdbcType="VARCHAR"/>
+        <result property="endTime" column="end_time" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id
-        , category_id, spec_id, merchant_id, shop_id, name, short_title, type, pack_fee, low_price, low_member_price,
-        unit_id, cover_img, images, sort, status, fail_msg, is_hot, type_enum, is_del, is_stock, is_pause_sale,
-        created_at, updated_at,  group_snap, spec_info, select_spec,
-        spec_table_headers, group_category_id, real_sales_number, stock_number, is_grounding, is_refund_stock, warn_line  </sql>
+        , category_id, spec_id, shop_id, name, short_title, type, pack_fee,
+        low_price, unit_id, cover_img, images, sort, status, fail_msg, is_hot, type_enum,
+        is_del, is_stock, is_pause_sale, created_at, updated_at,  group_type, group_snap,
+        spec_info, select_spec, spec_table_headers, group_category_id, real_sales_number,
+        stock_number, is_grounding, is_refund_stock, warn_line, show_type, weight, is_temp_price,
+        day_limit, single_order_limit, single_people_limit, days, start_time, end_time  </sql>
+
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -49,23 +62,14 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
 
-    <select id="selectByIdIn" resultMap="BaseResultMap">
-        select min(sku.suit) as suit, tb.*
-        from tb_product tb
-                 LEFT JOIN tb_product_sku sku ON tb.id = sku.product_id
-        where tb.id in (${ids})
-          and sku.is_del = 0
-        group by tb.id
-        order by tb.sort asc
-    </select>
 
     <select id="selectByIdInAndCheck" resultMap="BaseResultMap">
         select min(sku.suit) as suit, tb.*, sum(sku.real_sales_number) as stockNumber
         from tb_product tb
                  LEFT JOIN tb_product_sku sku ON tb.id = sku.product_id and sku.is_del = 0
         where tb.id in (${ids})
-          and tb.is_grounding = 1
-          and tb.type_enum!='group' and tb.status = 1
+          and tb.is_grounding = 1 and tb.type!='coupon' and tb.status = 1 and tb.is_del = 0
+          and tb.days LIKE concat('%',DAYNAME(CURRENT_DATE),'%') and tb.start_time &lt;= CURRENT_TIMESTAMP and tb.end_time &gt;= CURRENT_TIMESTAMP
         group by tb.id
         order by tb.sort asc
     </select>
@@ -76,9 +80,8 @@
         LEFT JOIN tb_product_sku sku ON tb.id = sku.product_id
         JOIN (SELECT product_id ,SUM(real_sales_number) as realSalesNumber
         FROM tb_product_sku
-        WHERE shop_id = #{shopId}
-        and is_del = 0
-        AND product_id IN
+        WHERE
+            shop_id = #{shopId} and is_del = 0 AND product_id IN
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>
@@ -86,7 +89,8 @@
         ORDER BY realSalesNumber DESC LIMIT 3) AS top_products ON tb.id = top_products.product_id
         where
         tb.status = 1
-        and tb.type_enum != 'group'
+        and tb.type != 'coupon' and tb.is_del = 0
+        and tb.days LIKE concat('%',DAYNAME(CURRENT_DATE),'%') and tb.start_time &lt;= CURRENT_TIMESTAMP and tb.end_time &gt;= CURRENT_TIMESTAMP
         and tb.is_grounding = 1
         group by tb.id
         order by stockNumber desc
@@ -101,17 +105,12 @@
           and tb.shop_id = #{shopId}
           and tb.status = 1
           and tb.is_grounding = 1
-          and tb.type_enum != 'group'
+          and tb.type != 'coupon' and tb.is_del = 0
+          and tb.days LIKE concat('%',DAYNAME(CURRENT_DATE),'%') and tb.start_time &lt;= CURRENT_TIMESTAMP and tb.end_time &gt;= CURRENT_TIMESTAMP
         group by tb.id
         order by tb.sort asc
     </select>
 
-
-    <!--  <select id="selectByIdIn" resultMap="BaseResultMap">-->
-    <!--    select *-->
-    <!--    from tb_product-->
-    <!--    where id in (${ids}) and is_show_mall =1 order by  sort asc-->
-    <!--    </select>-->
     <select id="selectById" resultType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
         select
         <include refid="Base_Column_List"/>
@@ -183,8 +182,7 @@
         LEFT JOIN tb_shop_info AS info ON info.id = pro.shop_id
         <where>
             info.`status`='1'
-#             AND pro.is_combo = '1'
-            AND pro.type_enum = 'group'
+            AND pro.type = 'coupon'
             AND (info.cities = #{cities} or info.districts = #{cities})
             <if test="proName != null and proName != ''">
                 AND pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%')
@@ -232,7 +230,7 @@
         LEFT JOIN tb_shop_info AS info ON info.id = `order`.shop_id
         <where>
             info.`status`='1'
-            AND pro.type_enum = 'group'
+            AND pro.type = 'coupon'
             AND (info.cities = #{cities} or info.districts = #{cities})
             <if test="proName != null and proName != ''">
                 AND pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%')

From cb54ffc11791d3b231823ab2f663390c905c8c3f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 19 Nov 2024 16:47:18 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/entity/TbProduct.java      |  4 +++
 .../entity/vo/ProductGroupVo.java             | 34 +++++++++++++++++++
 .../service/ProductService.java               |  3 ++
 3 files changed, 41 insertions(+)
 create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ProductGroupVo.java

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
index f69cbcf..54010b0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
@@ -1,11 +1,13 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import com.chaozhanggui.system.cashierservice.entity.vo.ProductGroupVo;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
 import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * (TbProduct)实体类
@@ -190,5 +192,7 @@ public class TbProduct implements Serializable {
 
     @Transient
     private TbProductSkuResult productSkuResult;
+
+    private List<ProductGroupVo> proGroupVo;
 }
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ProductGroupVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ProductGroupVo.java
new file mode 100644
index 0000000..61d7a28
--- /dev/null
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ProductGroupVo.java
@@ -0,0 +1,34 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ProductGroupVo {
+
+    private Integer count;
+    //选几个
+    private Integer number;
+    //类别
+    private String title;
+
+    //食物
+    private List<Food> goods=new ArrayList<>();
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Food {
+        private Integer proId;
+        private String proName;
+        private Integer skuId;
+        private String skuName;
+        private BigDecimal price;
+        private String number;
+        private String unitName;
+    }
+}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 8d5a312..9c4d456 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -472,6 +472,9 @@ public class ProductService {
         boolean isMemberPrice = shopInfo.getIsMemberPrice() != null && shopInfo.getIsMemberPrice() == 1;
         if (!CollectionUtils.isEmpty(products)) {
             products.parallelStream().forEach(it -> {
+                if("package".equals(it.getType())){
+                    it.setProGroupVo(JSONUtil.parseListTNewList(it.getGroupSnap(), ProductGroupVo.class));
+                }
                 TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId()));
                 it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : "");
                 if(check){

From c83155919c6f18a8d2f9491c62d21ded8563811e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 20 Nov 2024 13:56:19 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbShopShareRecordServiceImpl.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java
index 9defde2..cd54be6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java
@@ -78,7 +78,7 @@ public class TbShopShareRecordServiceImpl implements TbShopShareRecordService {
         for (TbShopShareRecord shareRecord : records) {
             shareRecord.setBeInvitedName(userInfoMapper.selectNameByPrimaryKey(shareRecord.getBeInvitedId()));
         }
-        result.put("records", new PageInfo<>());
+        result.put("records", new PageInfo<>(records));
         return result;
     }
 

From 8fbd4eae552430030c49cbab5e068d437f1d3c4d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 20 Nov 2024 14:36:44 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E9=82=80=E8=AF=B7=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=20=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=BA=E5=90=8D=E7=A7=B0/=E8=A2=AB=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbShopShareRecord.java     | 6 ++++--
 .../service/impl/TbShopShareRecordServiceImpl.java          | 1 +
 src/main/resources/mapper/TbActivateInRecordMapper.xml      | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShareRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShareRecord.java
index 9dccda5..eeb361d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShareRecord.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShareRecord.java
@@ -1,6 +1,7 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
 import com.chaozhanggui.system.cashierservice.entity.dto.BasePageDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -55,10 +56,11 @@ public class TbShopShareRecord extends BasePageDto implements Serializable  {
     /**
      * 生效时间/获得奖励的时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date rewardTime;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java
index 9defde2..00dc19a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopShareRecordServiceImpl.java
@@ -76,6 +76,7 @@ public class TbShopShareRecordServiceImpl implements TbShopShareRecordService {
             records = tbShopShareRecordMapper.queryIsNoSuccess(tbShopShareRecord);
         }
         for (TbShopShareRecord shareRecord : records) {
+            shareRecord.setInvitedName(userInfoMapper.selectNameByPrimaryKey(shareRecord.getInvitedId()));
             shareRecord.setBeInvitedName(userInfoMapper.selectNameByPrimaryKey(shareRecord.getBeInvitedId()));
         }
         result.put("records", new PageInfo<>());
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index 0cb283a..86d0a64 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -207,14 +207,14 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json,source)
-        values (#{vipUserId}, #{couponId}, #{name}, #{type}, #{proId}, #{fullAmount}, #{discountAmount}, #{num}, #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, #{createTime}, #{updateTime}, #{couponJson} , #{source})
+        values (#{vipUserId}, #{couponId}, #{name}, #{type}, #{proId}, #{fullAmount}, #{discountAmount}, #{num}, #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, now(), #{updateTime}, #{couponJson} , #{source})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
         insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json, source)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.vipUserId}, #{entity.couponId}, #{entity.name}, #{entity.type}, #{entity.proId}, #{entity.fullAmount}, #{entity.discountAmount}, #{entity.num}, #{entity.overNum}, #{entity.shopId}, #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.useStartTime}, #{entity.useEndTime}, #{entity.createTime}, #{entity.updateTime}, #{entity.couponJson},  #{entity.source})
+        (#{entity.vipUserId}, #{entity.couponId}, #{entity.name}, #{entity.type}, #{entity.proId}, #{entity.fullAmount}, #{entity.discountAmount}, #{entity.num}, #{entity.overNum}, #{entity.shopId}, #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.useStartTime}, #{entity.useEndTime},now(), #{entity.updateTime}, #{entity.couponJson},  #{entity.source})
         </foreach>
     </insert>
 
@@ -279,7 +279,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
 
     <update id="updateOverNum">
         update tb_activate_in_record
-        set over_num = #{overNum}
+        set over_num = #{overNum} ,update_time = now()
         where id = #{id}
     </update>
 

From 4e922fc3be44c500d9dc2741437b13d55615c09a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 23 Nov 2024 10:12:39 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProductService.java               | 22 +++++++++----------
 .../resources/mapper/TbProductGroupMapper.xml |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 096ca52..0f00642 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -254,17 +254,17 @@ public class ProductService {
             });
             groupList.sort(Comparator.comparingInt(TbProductGroup::getIsSale).reversed());
 
-            //热销
-            TbProductGroup hot = new TbProductGroup();
-            hot.setName("热销");
-            List<TbProduct> hots  = null;
-            if (proSets.isEmpty()) {
-                hots = new ArrayList<>();
-            }else {
-                hots = tbProductMapper.selectHot(shopId,proSets);
-            }
-            hot.setProducts(handleDate(hots,true,1,false, shopInfo));
-            groupList.add(0, hot);
+//            //热销
+//            TbProductGroup hot = new TbProductGroup();
+//            hot.setName("热销");
+//            List<TbProduct> hots  = null;
+//            if (proSets.isEmpty()) {
+//                hots = new ArrayList<>();
+//            }else {
+//                hots = tbProductMapper.selectHot(shopId,proSets);
+//            }
+//            hot.setProducts(handleDate(hots,true,1,false, shopInfo));
+//            groupList.add(0, hot);
 
             concurrentMap.put("productInfo", groupList);
         }
diff --git a/src/main/resources/mapper/TbProductGroupMapper.xml b/src/main/resources/mapper/TbProductGroupMapper.xml
index 4bd40bf..51bbae2 100644
--- a/src/main/resources/mapper/TbProductGroupMapper.xml
+++ b/src/main/resources/mapper/TbProductGroupMapper.xml
@@ -244,6 +244,7 @@
       FROM
       tb_product_group
       where shop_id=#{shopId} and is_show=1
+        and product_ids != '[]'
       <if test="groupId != null and groupId != ''">
           and id = #{groupId}
       </if>

From 0a971b7f2b4c76a0f0bc0928841fe385c0a1ad21 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 2 Dec 2024 16:33:07 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=A7=B0=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 7372799..a65bd38 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -68,7 +68,7 @@
         from tb_product tb
                  LEFT JOIN tb_product_sku sku ON tb.id = sku.product_id and sku.is_del = 0
         where tb.id in (${ids})
-          and tb.is_grounding = 1 and tb.type!='coupon' and tb.status = 1 and tb.is_del = 0
+          and tb.is_grounding = 1 and tb.type!='coupon' and tb.type != 'weigh' and tb.status = 1 and tb.is_del = 0
           and tb.days LIKE concat('%',DAYNAME(CURRENT_DATE),'%') and tb.start_time &lt;= CURRENT_TIMESTAMP and tb.end_time &gt;= CURRENT_TIMESTAMP
         group by tb.id
         order by tb.sort asc
@@ -105,7 +105,7 @@
           and tb.shop_id = #{shopId}
           and tb.status = 1
           and tb.is_grounding = 1
-          and tb.type != 'coupon' and tb.is_del = 0
+          and tb.type != 'coupon' and tb.type != 'weigh' and tb.is_del = 0
           and tb.days LIKE concat('%',DAYNAME(CURRENT_DATE),'%') and tb.start_time &lt;= CURRENT_TIMESTAMP and tb.end_time &gt;= CURRENT_TIMESTAMP
         group by tb.id
         order by tb.sort asc