diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index ee67aff1f..fc7bc3bb7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -122,10 +122,11 @@ public class AppUserServiceImpl implements AppUserService { return this.userFeignClient.saveWxFormId(saveFormId); } + /** * 创建微信小程序码,并上传到oss * - * @param formDto 小程序码的参数 + * @param formDto 小程序码的参数 * @return java.lang.String 小程序码的下载抵制 * @author work@yujt.net.cn * @date 2019/10/22 10:14 @@ -135,7 +136,7 @@ public class AppUserServiceImpl implements AppUserService { File wxaCodeUnlimit; try { String url = "pages/index/index?gridId=" + formDto.getGridId().toString(); - url = url+"&inviteUserId=" + formDto.getInviteUserId(); + url = url + "&inviteUserId=" + formDto.getInviteUserId(); wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCode(url); } catch (WxErrorException e) { throw new RenException("请求微信接口失败"); @@ -151,6 +152,7 @@ public class AppUserServiceImpl implements AppUserService { } return ossResult; } + /** * File文件转为byte[] * @@ -901,11 +903,16 @@ public class AppUserServiceImpl implements AppUserService { } String sessionKey = this.getUserSessionKey(formDto.getWxCode()); WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, formDto.getEncryptedData(), formDto.getIv()); + if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) { + // 标准文案后续修改 + return new Result().error("微信接口异常"); + } UserDTO userDTO = new UserDTO(); userDTO.setId(userDetail.getUserId()); userDTO.setNickname(wxMaUserInfo.getNickName()); userDTO.setFaceImg(wxMaUserInfo.getAvatarUrl()); userDTO.setSex(wxMaUserInfo.getGender()); + userDTO.setWxUnionId(wxMaUserInfo.getUnionId()); Result updateWxInfoResult = userFeignClient.updateWxInfo(userDTO); if (!updateWxInfoResult.success()) { return new Result().error("更新用户信息失败"); @@ -947,11 +954,10 @@ public class AppUserServiceImpl implements AppUserService { } /** - * * 用户加入网格党员群 * - * @params [userDto, lordFlag] * @return void + * @params [userDto, lordFlag] * @author liuchuang * @since 2019/11/21 10:58 */ @@ -967,6 +973,7 @@ public class AppUserServiceImpl implements AppUserService { formDto.setGridId(userDto.getGridId()); groupTask.joinGridPartyGroup(formDto); } + @Override public Result> invitationRecord() { return userFeignClient.invitationRecord(); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 3805ecfa2..1ac771a1f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -174,7 +174,7 @@ public class EpdcAppUserController { /** * 社群添加好友列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] * @author liuchuang * @since 2019/10/23 16:22 @@ -226,6 +226,7 @@ public class EpdcAppUserController { user.setNickname(userDto.getNickname()); user.setFaceImg(userDto.getFaceImg()); user.setSex(userDto.getSex()); + user.setWxUnionId(userDto.getWxUnionId()); userService.update(user); return new Result(); } @@ -313,10 +314,11 @@ public class EpdcAppUserController { public Result unauthorizedAmount(@RequestBody EpdcUnauthorizedAmountFromDTO fromDto) { return userService.getUnauthorizedAmount(fromDto); } + /** * 获取邀请记录 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] * @author liuchuang * @since 2019/10/23 16:22 @@ -328,11 +330,10 @@ public class EpdcAppUserController { } /** - * * 获取用户最后一次切换的网格信息 * - * @params [openId] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [openId] * @author liuchuang * @since 2019/12/6 11:01 */