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)); } } }