From 010432370292351880321fe6309b7cc5292a9648 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 23 Oct 2025 15:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/controller/admin/ProductController.java | 2 +-
 .../src/main/resources/mapper/MkDiscountActivityMapper.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
index 26a410ac2..7614b2077 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
@@ -72,7 +72,7 @@ public class ProductController {
     @OperationLog("商品-列表")
     //@SaAdminCheckPermission("product:list")
     public CzgResult<List<ProductDTO>> getProductList(ProductDTO param) {
-        Long shopId = StpKit.USER.getShopId(0L);
+        Long shopId = StpKit.USER.getShopId();
         param.setShopId(shopId);
         List<ProductDTO> productList = productService.getProductCacheList(param);
         productService.refreshProductStock(param, productList);
diff --git a/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml
index b28270ed2..ed624f0f9 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml
@@ -11,9 +11,9 @@
           AND is_del = 0
           AND status = 2
           AND NOW() BETWEEN valid_start_time AND valid_end_time
-#           AND (use_time_type = 'all' OR
+<!--          AND (use_time_type = 'all' OR
 #                (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
-#           AND use_days LIKE CONCAT('%', #{useDay}, '%')
+#           AND use_days LIKE CONCAT('%', #{useDay}, '%') -->
         ORDER BY sort DESC,
                  update_time DESC,
                  create_time DESC