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

分销配置报错修复

This commit is contained in:
张松 2025-11-05 13:59:42 +08:00
parent 2d60b5823e
commit dafc70aea4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java
View File

@ -55,7 +55,7 @@ public class MenuController {
@SaAdminCheckPermission(value = "menu:list", name = "菜单列表") @SaAdminCheckPermission(value = "menu:list", name = "菜单列表")
@GetMapping("/list") @GetMapping("/list")
public CzgResult<List<MenuVO>> all(String title, String startTime, String endTime) { public CzgResult<List<MenuVO>> all(String title, String startTime, String endTime) {
return CzgResult.success(menuService.getAll(title, startTime, endTime)); return CzgResult.success(menuService.getAll(title, startTime, endTime));
} }
/** /**

9
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java
View File

@ -66,6 +66,12 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl<MkDistributionC
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean edit(Long shopId, MkDistributionConfigDTO dto) { public Boolean edit(Long shopId, MkDistributionConfigDTO dto) {
MkDistributionConfig config = getOne(new QueryWrapper().eq(MkDistributionConfig::getShopId, shopId)); MkDistributionConfig config = getOne(new QueryWrapper().eq(MkDistributionConfig::getShopId, shopId));
if (config == null) {
config = new MkDistributionConfig();
config.setShopId(shopId);
save(config);
config = getOne(new QueryWrapper().eq(MkDistributionConfig::getShopId, shopId));
}
List<MkDistributionUser> distributionUserList = distributionUserService.list(new QueryWrapper().eq(MkDistributionUser::getShopId, shopId)); List<MkDistributionUser> distributionUserList = distributionUserService.list(new QueryWrapper().eq(MkDistributionUser::getShopId, shopId));
// 邀请人数变动 // 邀请人数变动
if (!config.getInviteCount().equals(dto.getInviteCount())) { if (!config.getInviteCount().equals(dto.getInviteCount())) {
@ -80,12 +86,13 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl<MkDistributionC
boolean b = updateById(config); boolean b = updateById(config);
if (TransactionSynchronizationManager.isSynchronizationActive()) { if (TransactionSynchronizationManager.isSynchronizationActive()) {
MkDistributionConfig finalConfig = config;
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override @Override
public void afterCommit() { public void afterCommit() {
// 事务成功提交后执行消息发送 // 事务成功提交后执行消息发送
distributionUserList.forEach(item -> { distributionUserList.forEach(item -> {
distributionUserService.initLevel(config, item); distributionUserService.initLevel(finalConfig, item);
}); });
distributionUserService.updateBatch(distributionUserList); distributionUserService.updateBatch(distributionUserList);
} }