|
@@ -136,14 +136,16 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
|
|
|
@Override
|
|
|
public StudentVo detail(Long userId) {
|
|
|
StudentVo detail = baseMapper.detail(userId);
|
|
|
- VipCardRecordWrapper.UserVip userVip = vipCardRecordService.userVipInfo(userId, ClientEnum.STUDENT);
|
|
|
- detail.setUserVip(userVip);
|
|
|
- detail.setVipType(EUserVipType.NORMAL);
|
|
|
- List<VipCardRecordWrapper.UserVipInfo> userVipInfos = vipCardRecordService.queryUserVipInfo(Collections.singletonList(userId), ClientEnum.STUDENT.getCode());
|
|
|
- Map<Long, VipCardRecordWrapper.UserVipInfo> curVipMap = userVipInfos.stream().collect(Collectors.toMap(VipCardRecordWrapper.UserVipInfo::getUserId, Function.identity()));
|
|
|
- VipCardRecordWrapper.UserVipInfo vipType = curVipMap.getOrDefault(userId, new VipCardRecordWrapper.UserVipInfo());
|
|
|
- detail.setMembershipEndTime(vipType.getCurrentVipSvipEndTime());
|
|
|
- detail.setVipType(vipType.getCurrentVipType());
|
|
|
+ if (detail != null) {
|
|
|
+ VipCardRecordWrapper.UserVip userVip = vipCardRecordService.userVipInfo(userId, ClientEnum.STUDENT);
|
|
|
+ detail.setUserVip(userVip);
|
|
|
+ detail.setVipType(EUserVipType.NORMAL);
|
|
|
+ List<VipCardRecordWrapper.UserVipInfo> userVipInfos = vipCardRecordService.queryUserVipInfo(Collections.singletonList(userId), ClientEnum.STUDENT.getCode());
|
|
|
+ Map<Long, VipCardRecordWrapper.UserVipInfo> curVipMap = userVipInfos.stream().collect(Collectors.toMap(VipCardRecordWrapper.UserVipInfo::getUserId, Function.identity()));
|
|
|
+ VipCardRecordWrapper.UserVipInfo vipType = curVipMap.getOrDefault(userId, new VipCardRecordWrapper.UserVipInfo());
|
|
|
+ detail.setMembershipEndTime(vipType.getCurrentVipSvipEndTime());
|
|
|
+ detail.setVipType(vipType.getCurrentVipType());
|
|
|
+ }
|
|
|
return detail;
|
|
|
}
|
|
|
|