调整获取用户信息接口

platform-api/src/main/java/com/platform/api/ApiAuthController.java

@@ -199,7 +199,7 @@ public class ApiAuthController extends ApiBaseAction {
         }
 
         // 调用zfb 登录
-        ReturnDTO returnDTO = zhiHouseService.wcLogin(sessionData.getString("openid"),userVo.getMobile());
+        ReturnDTO returnDTO = zhiHouseService.wcLogin(sessionData.getString("openid"),userVo.getMobile(),userInfo.getNickName(),userInfo.getAvatarUrl());
         String token = JSONObject.parseObject(JSONObject.toJSONString(returnDTO.getMessage())).getString("token");
 
         if (StringUtils.isNullOrEmpty(token)) {

platform-api/src/main/java/com/platform/api/ApiBrandController.java

@@ -157,7 +157,7 @@ public class ApiBrandController extends ApiBaseAction {
         }else{
             RequestScene requestScene = new RequestScene();
             if(params.containsKey("isShow")){
-                requestScene.setIsShow(true);
+                requestScene.setIsShow(1);
             }
             if(type == 21){
                 requestScene.setUserId(-1L);

platform-api/src/main/java/com/platform/api/ApiUserController.java

@@ -51,9 +51,8 @@ public class ApiUserController extends ApiBaseAction {
 
     @ApiOperation(value = "获取用户个人信息")
     @PostMapping("getUerInfo")
-    public Object getUerInfo(@LoginUser UserVo loginUser) {
-        long userId = loginUser.getUserId();
-        UserVo userVo = userService.queryObject(userId);
+    public Object getUerInfo() {
+        UserVo userVo = userService.queryByMobile(getUserName());
         if(org.apache.commons.lang.StringUtils.isNotBlank(userVo.getMobile())){
             TbUser sysUserEntity = zhiHouseService.queryByUserMobile(userVo.getMobile());
             if(null == sysUserEntity){

platform-common/src/main/java/com/platform/service/impl/ZhiHouseService.java

@@ -127,7 +127,7 @@ public class ZhiHouseService {
         }
     }
 
-    public ReturnDTO wcLogin(String appId,String userName) {
+    public ReturnDTO wcLogin(String appId,String userName,String nickName,String avatar) {
         String url = zhiHouseHost + "wcLogin";
         if(org.apache.commons.lang3.StringUtils.isBlank(appId)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "入参不全");
@@ -135,6 +135,8 @@ public class ZhiHouseService {
         Map<String ,Object> params = new HashMap<>(1);
         params.put("appid",appId);
         params.put("userName",userName);
+        params.put("nickName",nickName);
+        params.put("head",nickName);
         ResponseEntity<ReturnDTO> responseEntity = restTemplate.postForEntity(url,params,ReturnDTO.class);
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100,"登录失败");

platform-common/src/main/java/com/platform/vos/RequestScene.java

@@ -140,6 +140,6 @@ public class RequestScene implements Serializable {
 
     private String token;
 
-    private Boolean isShow;
+    private Integer isShow;
 
 }