|
|
@@ -61,13 +61,24 @@ public class MembershipController {
|
|
|
@Operation(summary = "获取我的会员信息")
|
|
|
@PostMapping("/my")
|
|
|
public Result<Map<String, Object>> getMyMembership(@RequestAttribute("userId") Long userId) {
|
|
|
- if (userId == null) {
|
|
|
- return Result.error("用户未登录");
|
|
|
+ // 匿名用户(userId <= 0)返回空会员数据,不报错
|
|
|
+ if (userId == null || userId <= 0) {
|
|
|
+ Map<String, Object> emptyResult = new HashMap<>();
|
|
|
+ emptyResult.put("memberLevel", "FREE");
|
|
|
+ emptyResult.put("memberExpireTime", null);
|
|
|
+ emptyResult.put("membership", null);
|
|
|
+ emptyResult.put("totalConsumption", 0);
|
|
|
+ return Result.success(emptyResult);
|
|
|
}
|
|
|
|
|
|
User user = userMapper.selectById(userId);
|
|
|
if (user == null) {
|
|
|
- return Result.error("用户不存在");
|
|
|
+ Map<String, Object> emptyResult = new HashMap<>();
|
|
|
+ emptyResult.put("memberLevel", "FREE");
|
|
|
+ emptyResult.put("memberExpireTime", null);
|
|
|
+ emptyResult.put("membership", null);
|
|
|
+ emptyResult.put("totalConsumption", 0);
|
|
|
+ return Result.success(emptyResult);
|
|
|
}
|
|
|
|
|
|
Long familyId = user.getFamilyId();
|