diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java index 3146cdb1c..7050f2295 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java @@ -56,12 +56,16 @@ public class ShopUserController { /** * 获取店铺用户详情 * @param id 会员用户id + * @param userId 用户id * @return 用户详情 */ @SaAdminCheckPermission("shopUser:detail") @GetMapping("/detail") - public CzgResult detail(@RequestParam Integer id) { - return CzgResult.success(shopUserService.getOne(new QueryWrapper().eq(ShopUser::getId, id).eq(ShopUser::getShopId, StpKit.USER.getShopId()))); + public CzgResult detail(Integer id, Integer userId) { + if (id == null && userId == null) { + return CzgResult.failure("id和userId不能重复为空"); + } + return CzgResult.success(shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, id).eq(ShopUser::getUserId, userId))); } /**