From 6ded7fb0de8353759f5923236d65f5a09852194e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 22 Oct 2025 15:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkEnableConfigServiceImpl.java        | 2 +-
 .../market/service/impl/MkRedemptionConfigServiceImpl.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java
index 3b873320..db8a8d29 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java
@@ -33,7 +33,7 @@ public class MkEnableConfigServiceImpl extends ServiceImpl<MkEnableConfigMapper,
             one.setIsEnable(1);
             one.setShopId(shopId);
             one.setType(type.getCode());
-            save(one);
+//            save(one);
         }
         MkEnableConfigVO configVO = BeanUtil.copyProperties(one, MkEnableConfigVO.class);
         if (StrUtil.isNotBlank(one.getShopIdList())) {
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
index ccd2a578..1ea9af00 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
@@ -19,6 +19,7 @@ import com.czg.market.dto.CouponInfoDTO;
 import com.czg.market.dto.MkRedemptionConfigDTO;
 import com.czg.market.dto.MkRedemptionDTO;
 import com.czg.market.dto.MkShopCouponGiftDTO;
+import com.czg.market.entity.MkEnableConfig;
 import com.czg.market.entity.MkRedemptionCode;
 import com.czg.market.entity.MkRedemptionConfig;
 import com.czg.market.service.MkRedemptionCodeService;
@@ -176,6 +177,9 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
 
     @Override
     public boolean add(Long mainShopId, MkRedemptionConfigDTO dto, boolean isRecharge) {
+        MkEnableConfig one = enableConfigService.getOne(new QueryWrapper().eq(MkEnableConfig::getMainShopId, mainShopId)
+                .eq(MkEnableConfig::getType, isRecharge ? TableValueConstant.EnableConfig.Type.RECHARGE_REDEMPTION.getCode() : TableValueConstant.EnableConfig.Type.COUPON_REDEMPTION.getCode()));
+        AssertUtil.isNull(one, "请先配置使用门店再添加兑换码");
         long count = count(new QueryWrapper().eq(MkRedemptionConfig::getName, dto.getName()).eq(MkRedemptionConfig::getMainShopId, mainShopId)
                 .eq(MkRedemptionConfig::getType, isRecharge ? 0 : 1));
         AssertUtil.isTrue(count > 0, "名称已存在");