diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberHandler.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberHandler.java index baa75f7..561a35e 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberHandler.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberHandler.java @@ -43,7 +43,7 @@ public class MemberHandler { @Operation(summary = "获取会员信息", description = "根据当前登录用户获取会员基本信息") public Mono getMemberInfo(ServerRequest request) { - Long memberId = authUtil.getMemberIdOrThrow(request); + Long memberId = authUtil.getMemberUserIdOrThrow(request); log.info("获取会员信息, memberId: {}", memberId); @@ -56,7 +56,7 @@ public class MemberHandler { @Operation(summary = "更新会员信息", description = "更新会员昵称、性别、生日、头像、地址等信息") public Mono updateMemberInfo(ServerRequest request) { - Long memberId = authUtil.getMemberIdOrThrow(request); + Long memberId = authUtil.getMemberUserIdOrThrow(request); log.info("更新会员信息, memberId: {}", memberId); @@ -70,7 +70,7 @@ public class MemberHandler { @Operation(summary = "绑定手机号", description = "通过微信小程序手机号code绑定会员手机号") public Mono bindPhone(ServerRequest request) { - Long memberId = authUtil.getMemberIdOrThrow(request); + Long memberId = authUtil.getMemberUserIdOrThrow(request); String phoneCode = request.queryParam("phoneCode").orElse(""); @@ -87,7 +87,7 @@ public class MemberHandler { @Operation(summary = "查询服务号关注状态", description = "查询会员是否关注微信服务号") public Mono checkSubscribeStatus(ServerRequest request) { - Long memberId = authUtil.getMemberIdOrThrow(request); + Long memberId = authUtil.getMemberUserIdOrThrow(request); log.info("查询服务号关注状态, memberId: {}", memberId); @@ -102,7 +102,7 @@ public class MemberHandler { @Operation(summary = "管理员更新手机号", description = "后台管理员为会员更新手机号") public Mono adminUpdatePhone(ServerRequest request) { - Long adminId = authUtil.getMemberIdOrThrow(request); + Long adminId = authUtil.getAdminUserIdOrThrow(request); String memberIdStr = request.pathVariable("id"); long memberId = NumberUtils.toLong(memberIdStr, 0L); @@ -134,7 +134,7 @@ public class MemberHandler { @Operation(summary = "管理员查看会员详情", description = "后台管理员查看指定会员的详细信息") public Mono adminGetMemberInfo(ServerRequest request) { - Long adminId = authUtil.getMemberIdOrThrow(request); + Long adminId = authUtil.getAdminUserIdOrThrow(request); String memberIdStr = request.pathVariable("id"); long memberId = NumberUtils.toLong(memberIdStr, 0L); @@ -162,7 +162,7 @@ public class MemberHandler { @Operation(summary = "管理员编辑会员信息", description = "后台管理员编辑会员信息") public Mono adminUpdateMemberInfo(ServerRequest request) { - Long adminId = authUtil.getMemberIdOrThrow(request); + Long adminId = authUtil.getAdminUserIdOrThrow(request); String memberIdStr = request.pathVariable("id"); long memberId = NumberUtils.toLong(memberIdStr, 0L); @@ -181,7 +181,7 @@ public class MemberHandler { @Operation(summary = "搜索会员列表", description = "后台管理员按关键词搜索会员,支持性别筛选和分页") public Mono searchMembers(ServerRequest request) { - Long adminId = authUtil.getMemberIdOrThrow(request); + Long adminId = authUtil.getAdminUserIdOrThrow(request); String keyword = request.queryParam("searchValue").orElse(null); Integer pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1); @@ -212,7 +212,7 @@ public class MemberHandler { @Operation(summary = "查看会员列表", description = "后台管理员分页查看所有会员列表") public Mono getAllMembers(ServerRequest request) { - Long adminId = authUtil.getMemberIdOrThrow(request); + Long adminId = authUtil.getAdminUserIdOrThrow(request); int pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1); int pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);