Compare commits

..

No commits in common. "314cc090eea755adc6daa51245c12bc861800a56" and "c613b2e3c15bd723432e068fea90bc314f821df7" have entirely different histories.

2 changed files with 1 additions and 4 deletions

View File

@ -89,9 +89,6 @@ public class AppMemberUserController {
MemberUserDO user = userService.getUser(getLoginUserId());
MemberLevelDO level = levelService.getLevel(user.getLevelId());
PaidMemberUserDO paidMemberUserDO = paidMemberUserService.getPaidMemberUserByUid(getLoginUserId());
if (paidMemberUserDO == null) {
return success(MemberUserConvert.INSTANCE.convert(user, level,null,null));
}
return success(MemberUserConvert.INSTANCE.convert(user, level,paidMemberUserDO.getPayMemberType(),paidMemberUserDO.getCardExpirationTime()));
}

View File

@ -159,7 +159,7 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
new LambdaQueryWrapperX<PaidMemberUserDO>().eq(PaidMemberUserDO::getUid,uid)
.orderByDesc(PaidMemberUserDO::getId));
if(list.isEmpty()){
return null;
throw exception(MEMBER_USER_NOT_EXISTS);
}
PaidMemberUserDO paidMemberUserDO = list.get(0);
return paidMemberUserDO;