From 78f3c5e0bc4b41a4813ab9a5952b6450cbffd54b 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, 17 Sep 2025 17:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkConsumeDiscountServiceImpl.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java
index 3aa22876..c643c17d 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java
@@ -24,7 +24,7 @@ import java.math.BigDecimal;
  * @since 2025-09-16
  */
 @Service
-public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountMapper, MkConsumeDiscount> implements MkConsumeDiscountService{
+public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountMapper, MkConsumeDiscount> implements MkConsumeDiscountService {
     @Override
     public MkConsumeDiscountVO detail(Long shopId) {
         MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId));
@@ -51,28 +51,29 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountM
         if (consumeDiscountDTO.getRandomDiscountList() == null && consumeDiscountDTO.getDiscountAmount() == null) {
             throw new ApiNotPrintException("优惠金额和随机优惠金额不能同时为空");
         }
+        MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId));
+
         if (TableValueConstant.ConsumeDiscount.DiscountType.RANDOM.getCode().equals(consumeDiscountDTO.getDiscountType())) {
             if (consumeDiscountDTO.getRandomDiscountList() == null || consumeDiscountDTO.getRandomDiscountList().isEmpty()) {
                 throw new ApiNotPrintException("随机优惠金额不能为空");
             }
-        }else  {
+
+            if (consumeDiscountDTO.getRandomDiscountList().stream().map(MkConsumeDiscountRandom::getProbability).reduce(BigDecimal.ZERO, BigDecimal::add).compareTo(new BigDecimal("100")) != 0) {
+                throw new ApiNotPrintException("随机概率综合必须为100%");
+            }
+            consumeDiscount.setRandomDiscountList(JSONArray.toJSONString(consumeDiscountDTO.getRandomDiscountList()));
+        } else {
             if (consumeDiscountDTO.getDiscountAmount() == null) {
                 throw new ApiNotPrintException("减免金额不能为空");
             }
-            
+
             if (consumeDiscountDTO.getDiscountAmount().compareTo(BigDecimal.ZERO) <= 0) {
                 throw new ApiNotPrintException("减免金额不能等于0");
             }
         }
 
-        MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId));
         BeanUtil.copyProperties(consumeDiscountDTO, consumeDiscount);
-        if (consumeDiscountDTO.getRandomDiscountList() != null) {
-            if (consumeDiscountDTO.getRandomDiscountList().stream().map(MkConsumeDiscountRandom::getProbability).reduce(BigDecimal.ZERO, BigDecimal::add).compareTo(new BigDecimal("100")) != 0) {
-                throw new ApiNotPrintException("随机概率综合必须为100%");
-            }
-            consumeDiscount.setRandomDiscountList(JSONArray.toJSONString(consumeDiscountDTO.getRandomDiscountList()));
-        }
+
 
         if (consumeDiscountDTO.getUseTypeList() != null) {
             consumeDiscount.setUseTypeList(JSONArray.toJSONString(consumeDiscountDTO.getUseTypeList()));