Merge remote-tracking branch 'origin/dev_v1' into dev_v1

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

@@ -200,7 +200,7 @@ public class ApiAuthController extends ApiBaseAction {
         }
 
         // 调用zfb 登录
-        ReturnDTO returnDTO = zhiHouseService.wcLogin(sessionData.getString("openid"),userVo.getMobile(),userInfo.getNickName(),userInfo.getAvatarUrl());
+        ReturnDTO returnDTO = zhiHouseService.wcLogin(sessionData.getString("openid"),userVo.getMobile(),userVo.getGender(),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/ApiUserController.java

@@ -97,7 +97,7 @@ public class ApiUserController extends ApiBaseAction {
         userService.update(loginUser);
         String token = request.getHeader(AuthorizationInterceptor.LOGIN_TOKEN_KEY);
         if(!ObjectUtils.isEmpty(loginUser.getMobile())){
-            ReturnDTO returnDTO = zhiHouseService.wcLogin(loginUser.getWeixin_openid(), loginUser.getMobile(), null, null);
+            ReturnDTO returnDTO = zhiHouseService.wcLogin(loginUser.getWeixin_openid(), loginUser.getMobile(),loginUser.getGender(), null, null);
             token = JSONObject.parseObject(JSONObject.toJSONString(returnDTO.getMessage())).getString("token");
             if (StringUtils.isNullOrEmpty(token)) {
                 logger.error("更新用户信息失败");

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

@@ -130,7 +130,7 @@ public class ZhiHouseService {
         }
     }
 
-    public ReturnDTO wcLogin(String appId,String userName,String nickName,String avatar) {
+    public ReturnDTO wcLogin(String appId,String userName,Integer gender,String nickName,String avatar) {
         String url = zhiHouseHost + "wcLogin";
         if(org.apache.commons.lang3.StringUtils.isBlank(appId)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "入参不全");
@@ -139,6 +139,7 @@ public class ZhiHouseService {
         params.put("appid",appId);
         params.put("userName",userName);
         params.put("nickName",nickName);
+        params.put("gender",gender);
         params.put("head",nickName);
         ResponseEntity<ReturnDTO> responseEntity = restTemplate.postForEntity(url,params,ReturnDTO.class);
         if(responseEntity.getStatusCode()!= HttpStatus.OK){