root/allLikeMall
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: root:314cc090eea755adc6daa51245c12bc861800a56
Branches Tags
root:master
root:yhy
root:khy-three
root:LCQ
root:main-zjh
root:khy-two
root:hokin
root:hy
root:sjy-three
root:Branch_chensl
root:sjy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy
..
compare: root:c613b2e3c15bd723432e068fea90bc314f821df7
Branches Tags
root:yhy
root:khy-three
root:master
root:LCQ
root:main-zjh
root:khy-two
root:hokin
root:hy
root:sjy-three
root:Branch_chensl
root:sjy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy

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

2 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
View File

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

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java
View File

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