czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangw
2025-10-28 13:41:54 +08:00
parent de02f98141 f83945f8f5
commit 7762a5bc36
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java
View File

@@ -25,13 +25,17 @@ public class MkDistributionLevelConfigServiceImpl extends ServiceImpl<MkDistribu
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()));
}
levelConfigList.forEach(item -> {
int level = 1;
for (MkDistributionLevelConfigDTO item : levelConfigList) {
MkDistributionLevelConfig config = BeanUtil.copyProperties(item, MkDistributionLevelConfig.class);
config.setDistributionConfigId(id);
config.setShopId(shopId);
config.setLevel(level++);
saveOrUpdate(config);
});
}
}
}

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -434,6 +434,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
// 上上级分销员
if (distributionUser.getParentId() != null) {
MkDistributionUser parent = getOne(new QueryWrapper().eq(MkDistributionUser::getId, distributionUser.getParentId()));
if (parent == null) {
return;
}