Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
wangw 2025-10-29 14:29:09 +08:00
commit 4285cc7bbd
1 changed files with 8 additions and 7 deletions

View File

@ -9,7 +9,9 @@ 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;
/**
* 分销员等级配置 服务层实现
@ -22,20 +24,19 @@ public class MkDistributionLevelConfigServiceImpl extends ServiceImpl<MkDistribu
@Override
public void updateByShopId(List<MkDistributionLevelConfigDTO> levelConfigList, Long shopId, Long id) {
if (levelConfigList.isEmpty()) {
remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id));
return;
}else {
remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id).notIn(MkDistributionLevelConfig::getId, levelConfigList.stream().map(MkDistributionLevelConfigDTO::getId).toList()));
}
int level = 1;
List<Long> 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));
}
}
}