|
@@ -1,7 +1,10 @@
|
|
package com.xyzc.start.security;
|
|
package com.xyzc.start.security;
|
|
|
|
|
|
|
|
+import com.xyzc.common.core.exception.ErrorCode;
|
|
|
|
+import com.xyzc.common.core.exception.ServerException;
|
|
import com.xyzc.common.web.security.mobile.MobileUserDetailsService;
|
|
import com.xyzc.common.web.security.mobile.MobileUserDetailsService;
|
|
import com.xyzc.common.web.security.user.UserDetail;
|
|
import com.xyzc.common.web.security.user.UserDetail;
|
|
|
|
+import com.xyzc.start.constant.BaseUserConst;
|
|
import com.xyzc.start.convert.BaseUserConvert;
|
|
import com.xyzc.start.convert.BaseUserConvert;
|
|
import com.xyzc.start.domain.BaseUser;
|
|
import com.xyzc.start.domain.BaseUser;
|
|
import com.xyzc.start.mapper.BaseUserMapper;
|
|
import com.xyzc.start.mapper.BaseUserMapper;
|
|
@@ -24,19 +27,27 @@ public class MobileUserDetailsServiceImpl implements MobileUserDetailsService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public UserDetails loadUserByMobile(String mobile) throws UsernameNotFoundException {
|
|
|
|
|
|
+ public UserDetails loadUserByMobile(String mobile) {
|
|
BaseUser userEntity = baseUserMapper.queryDetailByMobile(mobile, 1810310843224322049L);
|
|
BaseUser userEntity = baseUserMapper.queryDetailByMobile(mobile, 1810310843224322049L);
|
|
|
|
+
|
|
|
|
+ // TODO: 后期新添加用户抽离出来不要放在这里
|
|
|
|
+ // 未发现用户就保存用户信息
|
|
|
|
+ BaseUser baseUser = new BaseUser();
|
|
if (userEntity == null) {
|
|
if (userEntity == null) {
|
|
- throw new UsernameNotFoundException("手机号错误");
|
|
|
|
|
|
+ baseUser.setUserName(mobile);
|
|
|
|
+ baseUser.setMobile(mobile);
|
|
|
|
+ baseUser.setStatus(BaseUserConst.NORMAL_STATUS);
|
|
|
|
+ baseUser.setSurplusFuel(10L);
|
|
|
|
+
|
|
|
|
+ //TODO :代理商id
|
|
|
|
+ baseUser.setAgentMerId(1810310843224322049L);
|
|
|
|
+ baseUserMapper.insert(baseUser);
|
|
}
|
|
}
|
|
|
|
|
|
// 用户详细信息
|
|
// 用户详细信息
|
|
// 转换成UserDetail对象
|
|
// 转换成UserDetail对象
|
|
UserDetail userDetail = BaseUserConvert.INSTANCE.convertDetail(userEntity);
|
|
UserDetail userDetail = BaseUserConvert.INSTANCE.convertDetail(userEntity);
|
|
- userDetail.setUsername(userEntity.getUserName());
|
|
|
|
-
|
|
|
|
- // TODO: 会员卡列表
|
|
|
|
-
|
|
|
|
|
|
+ userDetail.setUsername(baseUser.getUserName());
|
|
|
|
|
|
// 账号不可用
|
|
// 账号不可用
|
|
// if (userEntity.getStatus() == UserStatusEnum.DISABLE.getValue()) {
|
|
// if (userEntity.getStatus() == UserStatusEnum.DISABLE.getValue()) {
|