From dcb68f57176da774ddc16f6148f2ccc4fc37c3a1 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, 18 Sep 2025 16:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/MkShopConsumeDiscountRecordService.java   | 3 +--
 .../service/impl/MkShopConsumeDiscountRecordServiceImpl.java | 5 ++---
 2 files changed, 3 insertions(+), 5 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 f4c0f371..8fca1cfa 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
@@ -28,7 +28,6 @@ public interface MkShopConsumeDiscountRecordService extends IService<MkShopConsu
      * @param shopUserId 店铺用户id
      * @param orderId 订单id
      * @param amount 减免金额
-     * @return 是否成功
      */
-    boolean useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount);
+    void useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount);
 }
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 945735c0..655989f5 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
@@ -38,21 +38,20 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
     private ShopUserService shopUserService;
 
     @Override
-    public boolean useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount) {
+    public void useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount) {
         AssertUtil.isTrue(recordId == null || shopUserId == null || orderId == null || amount == null, "参数不能为空");
 
         MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getId, recordId)
                 .eq(MkShopConsumeDiscountRecord::getShopUserId, shopUserId)
                 .eq(MkShopConsumeDiscountRecord::getOrderId, orderId));
         AssertUtil.isNull(discountRecord, "减免记录不存在");
-        AssertUtil.isTrue(discountRecord.getIsUse() == 0, "减免记录已使用");
+        AssertUtil.isTrue(discountRecord.getIsUse() == 1, "减免记录已使用");
         AssertUtil.isTrue(discountRecord.getAmount().compareTo(amount) != 0, "减免金额不同");
 
         boolean flag = updateChain().eq(MkShopConsumeDiscountRecord::getId, recordId)
                 .eq(MkShopConsumeDiscountRecord::getIsUse, 0)
                 .set(MkShopConsumeDiscountRecord::getIsUse, 1).update();
         AssertUtil.isTrue(!flag, "修改失败");
-        return true;
     }
 
     @Override