|
@@ -59,12 +59,8 @@ public class UserAuthServiceImpl implements IUserAuthService {
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public boolean sendCode(UserMobileLoginBO login) {
|
|
|
- //todo 后续删除
|
|
|
- if (login != null) {
|
|
|
- return true;
|
|
|
- }
|
|
|
-
|
|
|
// 验证图形验证码
|
|
|
+ // todo 先关闭图形验证码
|
|
|
boolean validate = captchaService.validate(login.getKey(), login.getCode());
|
|
|
AssertUtils.isTrue(validate, ErrorCode.CAPTCHA_ERROR);
|
|
|
|
|
@@ -164,16 +160,18 @@ public class UserAuthServiceImpl implements IUserAuthService {
|
|
|
baseUserTokenVo.setUserName(userDetail.getUsername());
|
|
|
//
|
|
|
SysOssVo sysOssVo = sysOssMapper.selectVoById(userDetail.getAvatar());
|
|
|
- baseUserTokenVo.setAvatar(sysOssVo.getUrl());
|
|
|
+ baseUserTokenVo.setAvatar(sysOssVo != null ? sysOssVo.getUrl() : null);
|
|
|
// TODO 剩余次数,虚拟
|
|
|
baseUserTokenVo.setUseCount(109);
|
|
|
|
|
|
// 添加用户拥有的会员卡
|
|
|
List<BaseUserMemberCardVo> memberCardVos = baseUserMapper.queryMyMemberCardByUserId(userDetail.getId());
|
|
|
- baseUserTokenVo.setMemberCardVoList(memberCardVos);
|
|
|
-
|
|
|
- // 添加用户会员卡数量
|
|
|
- baseUserTokenVo.setMemberCardCount(memberCardVos.size());
|
|
|
+ baseUserTokenVo.setMemberCardCount(0);
|
|
|
+ if (memberCardVos != null && !memberCardVos.isEmpty()) {
|
|
|
+ baseUserTokenVo.setMemberCardVoList(memberCardVos);
|
|
|
+ // 添加用户会员卡数量
|
|
|
+ baseUserTokenVo.setMemberCardCount(memberCardVos.size());
|
|
|
+ }
|
|
|
|
|
|
return baseUserTokenVo;
|
|
|
}
|