|
@@ -215,11 +215,14 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
|
|
|
memberPriceVo.setList(memberPriceSettingsVos);
|
|
|
ActivityPlanVo activityPlan = activityPlanService.detail(query.getActivityId());
|
|
|
|
|
|
- if (activityPlan == null || activityPlan.getActivityState() != 1) {
|
|
|
+ if (activityPlan == null || activityPlan.getActivityState() != 1 || query.getUserId() == null) {
|
|
|
return memberPriceVo;
|
|
|
}
|
|
|
|
|
|
SysUser user = sysUserFeignService.queryUserById(query.getUserId());
|
|
|
+ if (user == null) {
|
|
|
+ throw new BizException("未找到用户信息");
|
|
|
+ }
|
|
|
memberPriceVo.setDiscount(YesOrNoEnum.YES);
|
|
|
memberPriceVo.setAvatar(user.getAvatar());
|
|
|
memberPriceVo.setUsername(user.getUsername());
|