From 7e6b791ac9c286ea7f077c0dcc693490278dfedb Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 23 Oct 2025 16:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E5=88=86=E7=B1=BBPid=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MkDiscountActivityService.java    |  2 +-
 .../java/com/czg/order/dto/CheckOrderPay.java |  4 ++++
 .../impl/MkDiscountActivityServiceImpl.java   | 20 +++++++++++++++++--
 .../mapper/MkDiscountActivityMapper.xml       |  6 +++---
 .../service/impl/OrderInfoServiceImpl.java    |  2 +-
 .../impl/ShopProdCategoryServiceImpl.java     |  3 ++-
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java
index df9f2d00..5bec27cb 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java
@@ -15,7 +15,7 @@ import com.czg.market.entity.MkDiscountActivity;
 public interface MkDiscountActivityService extends IService<MkDiscountActivity> {
     Page<MkDiscountActivityDTO> getActivityPage(TimeQueryParam param, Long shopId);
 
-    MkDiscountActivityDTO checkDiscountAct(Long shopId, boolean couponShare, boolean vipShare, boolean limitRateShare, boolean pointsShare);
+    MkDiscountActivityDTO checkDiscountAct(Long discountActId, boolean couponShare, boolean vipShare, boolean limitRateShare, boolean pointsShare);
 
     MkDiscountActivityDTO getActivityByShopId(Long shopId);
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
index 533eb5d5..05b8efae 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
@@ -76,6 +76,10 @@ public class CheckOrderPay implements Serializable {
      * 满减活动抵扣金额
      */
     private BigDecimal discountActAmount;
+    /**
+     * 满减活动Id
+     */
+    private Long discountActId;
     /**
      * 其它优惠券抵扣金额
      */
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java
index cbfd82d6..493f2852 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java
@@ -62,8 +62,8 @@ public class MkDiscountActivityServiceImpl extends ServiceImpl<MkDiscountActivit
     }
 
     @Override
-    public MkDiscountActivityDTO checkDiscountAct(Long shopId, boolean couponShare, boolean vipShare, boolean limitRateShare, boolean pointsShare) {
-        MkDiscountActivityDTO activityDTO = getActivityByShopId(shopId);
+    public MkDiscountActivityDTO checkDiscountAct(Long discountActId, boolean couponShare, boolean vipShare, boolean limitRateShare, boolean pointsShare) {
+        MkDiscountActivityDTO activityDTO = getActivityById(discountActId);
         AssertUtil.isNull(activityDTO, "店铺未配置满减活动");
         //检查是否开启了优惠券抵扣
         if (couponShare && activityDTO.getCouponShare() == 0) {
@@ -105,6 +105,22 @@ public class MkDiscountActivityServiceImpl extends ServiceImpl<MkDiscountActivit
         return activityDTO;
     }
 
+
+    private MkDiscountActivityDTO getActivityById(Long discountActId) {
+        MkDiscountActivity activity = this.getById(discountActId);
+        if (activity == null) {
+            return null;
+        }
+        MkDiscountActivityDTO activityDTO = BeanUtil.toBean(activity, MkDiscountActivityDTO.class);
+        activityDTO.setThresholds(thresholdMapper.selectListByQuery(
+                new QueryWrapper()
+                        .eq(MkDiscountThreshold::getActivityId, activity.getId())
+                        .orderBy(MkDiscountThreshold::getFullAmount, false)
+        ));
+        return activityDTO;
+    }
+
+
     @Override
     public void addActivity(MkDiscountActivityDTO param) {
         if (CollUtil.isEmpty(param.getThresholds())) {
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 ed624f0f..bae252c2 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
-#                (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
-#           AND use_days LIKE CONCAT('%', #{useDay}, '%') -->
+          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}, '%')
         ORDER BY sort DESC,
                  update_time DESC,
                  create_time DESC
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 35ffab3e..d926f439 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -352,7 +352,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         // 满减活动校验 不为霸王餐 霸王餐不参与满减
         if (!param.isFreeDine() && param.getDiscountActAmount().compareTo(BigDecimal.ZERO) > 0) {
             //检查满减活动是否开启
-            discountAct = discountActService.checkDiscountAct(orderInfo.getShopId(),
+            discountAct = discountActService.checkDiscountAct(param.getDiscountActId(),
                     CollUtil.isNotEmpty(param.getCouponList()), param.isVipPrice(), param.getLimitRate() != null,
                     param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0);
         }
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
index 1adabc5b..97819f17 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
@@ -89,13 +89,14 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMap
 
     @Override
     public void updateShopProdCategory(ShopProdCategoryDTO dto) {
-        Long shopId = StpKit.USER.getShopId(0L);
+        Long shopId = StpKit.USER.getShopId();
         dto.setShopId(shopId);
         boolean exists = super.exists(query().eq(ShopProdCategory::getName, dto.getName()).eq(ShopProdCategory::getShopId, shopId).ne(ShopProdCategory::getId, dto.getId()));
         if (exists) {
             throw new CzgException("商品分类已存在");
         }
         ShopProdCategory entity = BeanUtil.copyProperties(dto, ShopProdCategory.class);
+        entity.setPid(0L);
         super.updateById(entity);
     }