From 7df089f070dead42e2221189c410931d26ca1235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 27 Sep 2025 19:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MkShopConsumeDiscountRecordServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 7930fc533..170c7deeb 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
@@ -86,7 +86,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
         AssertUtil.isTrue( shopUserId == null || orderId == null || amount == null, "参数不能为空");
         ShopUser shopUser = shopUserService.getById(shopUserId);
 
-        MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
+        MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper()
                 .eq(MkShopConsumeDiscountRecord::getShopUserId, shopUserId)
                 .eq(MkShopConsumeDiscountRecord::getOrderId, orderId));
         AssertUtil.isNull(discountRecord, "减免记录不存在");
@@ -95,6 +95,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
 
         boolean flag = updateChain().eq(MkShopConsumeDiscountRecord::getId, discountRecord.getId())
                 .eq(MkShopConsumeDiscountRecord::getIsUse, 0)
+                .set(MkShopConsumeDiscountRecord::getOrderId, orderId)
                 .set(MkShopConsumeDiscountRecord::getIsUse, 1).update();
         AssertUtil.isTrue(!flag, "修改失败");
     }
@@ -106,7 +107,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
                 .eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
                 .eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
         if (discountRecord != null) {
-            if (discountRecord.getOrderId() == null) {
+            if (discountRecord.getOrderId() == null && orderId != null) {
                 discountRecord.setOrderId(orderId);
                 updateById(discountRecord);
             }