| 
														
															@@ -11,14 +11,15 @@ import com.zanxiang.mybatis.entity.GameExt; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.mybatis.entity.User; 
														 | 
														
														 | 
														
															 import com.zanxiang.mybatis.entity.User; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.mybatis.mapper.UserMapper; 
														 | 
														
														 | 
														
															 import com.zanxiang.mybatis.mapper.UserMapper; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.domain.dto.UserDTO; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.domain.dto.UserDTO; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-import com.zanxiang.sdk.domain.dto.UserTokenDTO; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-import com.zanxiang.sdk.domain.params.*; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.zanxiang.sdk.domain.params.BindPhoneParam; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.zanxiang.sdk.domain.params.FindPasswordParam; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.zanxiang.sdk.domain.params.UpdatePasswordParam; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.zanxiang.sdk.domain.params.UserData; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.domain.vo.CustomerVO; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.domain.vo.CustomerVO; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.domain.vo.UserVO; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.domain.vo.UserVO; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.service.GameExtService; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.service.GameExtService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.service.SmsService; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.service.SmsService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.service.UserService; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.service.UserService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-import com.zanxiang.sdk.service.UserTokenService; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.sdk.util.RegisterUtil; 
														 | 
														
														 | 
														
															 import com.zanxiang.sdk.util.RegisterUtil; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import lombok.extern.slf4j.Slf4j; 
														 | 
														
														 | 
														
															 import lombok.extern.slf4j.Slf4j; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.apache.logging.log4j.util.Strings; 
														 | 
														
														 | 
														
															 import org.apache.logging.log4j.util.Strings; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -38,9 +39,6 @@ import java.util.Objects; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 @Service 
														 | 
														
														 | 
														
															 @Service 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService { 
														 | 
														
														 | 
														
															 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    @Autowired 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    private UserTokenService userTokenService; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															- 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private GameExtService gameExtService; 
														 | 
														
														 | 
														
															     private GameExtService gameExtService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -161,25 +159,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     /** 
														 | 
														
														 | 
														
															     /** 
														 | 
													
												
											
												
													
														| 
														 | 
														
															      * 获取用户信息 
														 | 
														
														 | 
														
															      * 获取用户信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															      * 
														 | 
														
														 | 
														
															      * 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-     * @param userDetailParam : 用户详情参数 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-     * @param userData        : userData 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-     * @return : 返回用户信息 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+     * @param userData : 用户信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+     * @return : 返回用户详情信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															      */ 
														 | 
														
														 | 
														
															      */ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Override 
														 | 
														
														 | 
														
															     @Override 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    public ResultVO<UserVO> getUserDetail(UserDetailParam userDetailParam, UserData userData) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        String token = userDetailParam.getToken(); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        Integer deviceType = userData.getDeviceType(); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        UserTokenDTO userTokenDTO = userTokenService.getTokenInfoByTokenDevice(token, deviceType); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        if (userTokenDTO == null) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return new ResultVO<>(HttpStatusEnum.INVALID_PARAMS); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public UserVO getUserDetail(UserData userData) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        Long userId = userData.getUserId(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //查询用户信息 
														 | 
														
														 | 
														
															         //查询用户信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        User user = super.getById(userTokenDTO.getUserId()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        if (user == null) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return new ResultVO<>(HttpStatusEnum.UNKNOWN_ERROR); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        UserVO userVO = BeanUtils.copy(user, UserVO.class); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        return new ResultVO<>(HttpStatusEnum.SUCCESS, userVO); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        User user = this.getById(userId); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        //构造用户登录信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return UserVO.builder() 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                .userId(user.getId()) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                .userName(user.getUsername()) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                .authentication(user.getAuthentication()) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                .bindPhone(Strings.isBlank(user.getMobile()) ? 0 : 1) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                .build(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     /** 
														 | 
														
														 | 
														
															     /** 
														 |