From da449a59215a9aac535130775f02aa5cc70ce387 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 19 Nov 2025 08:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/page/service/impl/ShopPageAppServiceImpl.java   | 3 +--
 .../service/impl/ShopStoreActivityBaseServiceImpl.java   | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
index 44d32165..369de289 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
@@ -119,7 +119,7 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
      * @param subsite_id
      * @param store_id
      * @param tpl_id
-     * @param app_type
+     * @param app_type   69 107 3
      */
     @Override
     public void getModel(ModelAndView view, Integer subsite_id, Integer store_id, Integer tpl_id, Integer app_type) {
@@ -135,7 +135,6 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
         String page_nav = pageBase.get("PageNav").toString();
         String page_config = pageBase.get("PageConfig").toString();
 
-        //用户中心菜单
         //用户中心菜单
         Map menu = new HashMap();
         String app_member_center = accountBaseConfigService.getConfig("app_member_center");
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreActivityBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreActivityBaseServiceImpl.java
index 0a0a0f88..ec33a6b9 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreActivityBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreActivityBaseServiceImpl.java
@@ -5553,13 +5553,14 @@ public class ShopStoreActivityBaseServiceImpl extends BaseServiceImpl<ShopStoreA
             activity_rule.put("product_image", product_row.getProduct_image());
             activity_rule.put("item_unit_price", item_row.getItem_unit_price());
 
-            // cut_hour - 砍价有效期（小时）
-            Integer cut_hour = getParameter("cut_hour", 72);
-            // product_count - 参与活动商品总数（个）
-            Integer product_count = getParameter("product_count", 3);
+
+            Integer cut_hour = getParameter("cut_hour", 72);// cut_hour - 砍价有效期（小时）
+            Integer product_count = getParameter("product_count", 3);// product_count - 参与活动商品总数（个）
             activity_rule.put("product_count", product_count); // 参与活动的商品总数（个）
             activity_rule.put("cut_hour", cut_hour); // 砍价的有效期（小时）
 
+            data.put("product_count", product_count);
+            data.put("cut_hour", cut_hour);
         } else if (ObjectUtil.equal(activity_type_id, StateCode.ACTIVITY_TYPE_GIFTBAG)) {
             //a+b组合套餐
             String activity_bag_category = getParameter("activity_bag_category");//礼包分类