From 930ca57ddf362ffb6d512eedb413b3409d18e615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 25 Sep 2025 17:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MkShopConsumeDiscountRecordService.java       | 10 ++++++++--
 .../MkShopConsumeDiscountRecordServiceImpl.java   | 15 +++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java
index 0db8ba0e..48ee50e6 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java
@@ -1,8 +1,8 @@
 package com.czg.market.service;
 
+import com.czg.market.vo.MkConsumeDiscountVO;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.MkShopConsumeDiscountRecord;
-import jakarta.validation.constraints.NotNull;
 
 import java.math.BigDecimal;
 
@@ -22,7 +22,13 @@ public interface MkShopConsumeDiscountRecordService extends IService<MkShopConsu
      */
     MkShopConsumeDiscountRecord getDiscount(Long shopId, Long userId, Long orderId);
 
-    void canUseDiscount(Long shopId, Long userId, BigDecimal amount);
+    /**
+     * 是否可用新客立减
+     *
+     * @param shopId 店铺id
+     * @param userId 用户id
+     */
+    MkConsumeDiscountVO checkDiscount(Long shopId, Long userId);
 
     /**
      * 修改记录状态
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
index 9851634f..ce58bba1 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
@@ -6,7 +6,6 @@ import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
 import com.czg.exception.ApiNotPrintException;
-import com.czg.exception.CzgException;
 import com.czg.market.entity.MkConsumeDiscountRandom;
 import com.czg.market.service.MkConsumeDiscountService;
 import com.czg.market.vo.MkConsumeDiscountVO;
@@ -20,7 +19,6 @@ import com.czg.market.entity.MkShopConsumeDiscountRecord;
 import com.czg.market.service.MkShopConsumeDiscountRecordService;
 import com.czg.service.market.mapper.MkShopConsumeDiscountRecordMapper;
 import jakarta.annotation.Resource;
-import jakarta.validation.constraints.NotNull;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
@@ -43,7 +41,9 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
     @DubboReference
     private OrderInfoService orderInfoService;
 
-    private MkConsumeDiscountVO checkOpen(Long shopId) {
+
+    @Override
+    public MkConsumeDiscountVO checkDiscount(Long shopId, Long userId) {
         MkConsumeDiscountVO consumeDiscountVO = consumeDiscountService.detail(shopId);
         if (consumeDiscountVO.getIsEnable() != 1) {
             throw new ApiNotPrintException("新客立减未开启");
@@ -60,12 +60,6 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
         if ("RANDOM".equals(consumeDiscountVO.getDiscountType()) && (randomList == null || randomList.isEmpty()) ){
             throw new ApiNotPrintException("随机立减配置错误");
         }
-        return consumeDiscountVO;
-    }
-
-    @Override
-    public void canUseDiscount(Long shopId, Long userId, BigDecimal amount) {
-        checkOpen(shopId);
         ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
         long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
                 .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
@@ -77,6 +71,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
 
         AssertUtil.isTrue(recordCount > 0, "新客立减已使用");
 
+        return consumeDiscountVO;
     }
 
     @Override
@@ -111,7 +106,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
         if (count > 0) {
             throw new ApiNotPrintException("新客立减仅新用户可用");
         }
-        MkConsumeDiscountVO consumeDiscountVO = checkOpen(shopId);
+        MkConsumeDiscountVO consumeDiscountVO = checkDiscount(shopId, userId);
 
         DateTime now = DateUtil.date();