diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java index b8d05c1..bbe74f3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebUserController.java @@ -70,6 +70,7 @@ public class WebUserController { user.setDelFlag(CommonConstant.DEL_FLAG_0); user.setOrgCode(null); user.setIp(ipAddr); + user.setProgramType("艺体志愿宝"); sysUserService.saveUser(user, null, null, null); //注册成功后,直接登录 sysLoginModel.setUsername(sysLoginModel.getPhone()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java index 793cf01..af1d4e2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebUserService.java @@ -59,6 +59,10 @@ public class WebUserService { String syspassword = sysUser.getPassword(); AssertUtils.isTrue(syspassword.equals(userpassword), "手机号或密码错误"); //用户登录信息 + //获取vip信息 + VipDTO vipDTO = miniUserService.getUserVip(sysUser.getId()); + AssertUtils.notNull(vipDTO, "当前为非会员账号,请移步到小程序使用"); + AssertUtils.notTrue(vipDTO.getVipLevel() == 0, "当前为非会员账号,请移步到小程序使用"); //生成token String token = JwtUtil.sign(sysUser.getUsername(), syspassword); // 设置token缓存有效时间 @@ -70,7 +74,6 @@ public class WebUserService { //添加日志 baseCommonService.addLog("前台用户登录:用户名: " + sysUser.getUsername() + ",登录成功!", CommonConstant.LOG_TYPE_1, null); //获取vip信息 - VipDTO vipDTO = miniUserService.getUserVip(sysUser.getId()); if (vipDTO != null) { obj.put("vipInfo", vipDTO); } else {