diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java index e937a41e..8d223247 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java @@ -55,7 +55,7 @@ public class MenuController { @SaAdminCheckPermission(value = "menu:list", name = "菜单列表") @GetMapping("/list") public CzgResult> all(String title, String startTime, String endTime) { - return CzgResult.success(menuService.getAll(title, startTime, endTime)); + return CzgResult.success(menuService.getAll(title, startTime, endTime)); } /** diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java index e8855e1f..991608ee 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java @@ -66,6 +66,12 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl distributionUserList = distributionUserService.list(new QueryWrapper().eq(MkDistributionUser::getShopId, shopId)); // 邀请人数变动 if (!config.getInviteCount().equals(dto.getInviteCount())) { @@ -80,12 +86,13 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl { - distributionUserService.initLevel(config, item); + distributionUserService.initLevel(finalConfig, item); }); distributionUserService.updateBatch(distributionUserList); }