From 4d9773226e2a22453841c49c1a608df682bdf0e6 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:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=87=8F=E5=85=8D=E9=87=91=E9=A2=9D=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/UShopConsumeDiscountController.java    |  1 +
 .../MkShopConsumeDiscountRecordService.java     |  3 ++-
 .../src/main/java/com/czg/utils/AssertUtil.java | 10 +++++++++-
 .../MkShopConsumeDiscountRecordServiceImpl.java | 17 +++++++++++++++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
index 76d67062..8df4b7c2 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
@@ -41,6 +41,7 @@ public class UShopConsumeDiscountController {
      */
     @GetMapping
     public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId, @RequestParam Long orderId) {
+        shopConsumeDiscountRecordService.useDiscount(null, null,null,null);
         return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, StpKit.USER.getLoginIdAsLong(), orderId));
     }
 
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 42eeb399..8e98cd5a 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
@@ -2,6 +2,7 @@ package com.czg.market.service;
 
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.MkShopConsumeDiscountRecord;
+import jakarta.validation.constraints.NotNull;
 
 import java.math.BigDecimal;
 
@@ -26,5 +27,5 @@ public interface MkShopConsumeDiscountRecordService extends IService<MkShopConsu
      * @param recordId MkShopConsumeDiscountRecord 主键
      * @return 是否成功
      */
-    boolean useDiscount(Long recordId, Long orderId, BigDecimal amount);
+    boolean useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount);
 }
diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/AssertUtil.java b/cash-common/cash-common-tools/src/main/java/com/czg/utils/AssertUtil.java
index f8200484..94505ad4 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/AssertUtil.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/AssertUtil.java
@@ -77,6 +77,12 @@ public class AssertUtil {
     public static void isNull(Object object, String errorMsgTemplate, Object... params) {
         isNull(object, StrUtil.format(errorMsgTemplate, params));
     }
+    public static void isTrue(boolean flag, String errorMsgTemplate, Object... params) {
+        if (flag) {
+            throw new ValidateException(StrUtil.format(errorMsgTemplate, params));
+        }
+    }
+
     /**
      * 检查数组是否不为空，如果为空则抛出异常
      *
@@ -150,4 +156,6 @@ public class AssertUtil {
     public static <K, V> void isMapEmpty(Map<K, V> map, String errorMsgTemplate, Object... params) {
         isMapEmpty(map, StrUtil.format(errorMsgTemplate, params));
     }
-}
\ No newline at end of file
+
+
+}
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 1a03f7ca..945735c0 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
@@ -9,12 +9,14 @@ import com.czg.exception.ApiNotPrintException;
 import com.czg.market.entity.MkConsumeDiscountRandom;
 import com.czg.market.service.MkConsumeDiscountService;
 import com.czg.market.vo.MkConsumeDiscountVO;
+import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 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;
 
@@ -36,10 +38,21 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
     private ShopUserService shopUserService;
 
     @Override
-    public boolean useDiscount(Long recordId, Long orderId, BigDecimal amount) {
-        return updateChain().eq(MkShopConsumeDiscountRecord::getId, recordId)
+    public boolean 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.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