From de28c59bd56ea4d1cd6cea2c2dbbaf7869af586f 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, 29 Oct 2025 14:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MkDistributionLevelConfigServiceImpl.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java index 87c944900..b7db8606d 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java @@ -9,6 +9,7 @@ import com.czg.market.service.MkDistributionLevelConfigService; import com.czg.service.market.mapper.MkDistributionLevelConfigMapper; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -23,25 +24,19 @@ public class MkDistributionLevelConfigServiceImpl extends ServiceImpl levelConfigList, Long shopId, Long id) { - if (levelConfigList.isEmpty()) { - remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id)); - return; - }else { - List list = levelConfigList.stream().map(MkDistributionLevelConfigDTO::getId).filter(Objects::nonNull).toList(); - if (!list.isEmpty()) { - remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id) - .notIn(MkDistributionLevelConfig::getId, list)); - - } - } - int level = 1; + List idList = new ArrayList<>(); for (MkDistributionLevelConfigDTO item : levelConfigList) { MkDistributionLevelConfig config = BeanUtil.copyProperties(item, MkDistributionLevelConfig.class); config.setDistributionConfigId(id); config.setShopId(shopId); config.setLevel(level++); saveOrUpdate(config); + idList.add(config.getId()); + } + + if (!idList.isEmpty()) { + remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id).notIn(MkDistributionLevelConfig::getId, idList)); } } }