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 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index c7cabf455..f16a1eeec 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -148,5 +148,12 @@ public interface UserDao extends BaseDao { */ int selectCountUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); - + /** + * @param workUserFromDto + * @return java.util.List + * @Author yinzuomei + * @Description 获取用户列表:党员认证失败 + * @Date 2019/12/7 11:23 + **/ + List selectPartyAuthenticationFailedList(EpdcWorkUserFromDTO workUserFromDto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 143d14c10..da08aef69 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -90,6 +90,8 @@ public class UserServiceImpl extends BaseServiceImpl implem private UserDetailRedis userDetailRedis; @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private PartyAuthenticationFailedDao partyAuthenticationFailedDao; @Override public PageData page(Map params) { this.verifyParams(params); @@ -488,9 +490,6 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(userEntity.getState()); } - @Autowired - private PartyAuthenticationFailedDao partyAuthenticationFailedDao; - @Override @Transactional(rollbackFor = Exception.class) public Result completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { @@ -535,6 +534,7 @@ public class UserServiceImpl extends BaseServiceImpl implem partyAuthenticationFailedDao.insert(authenticationFailedEntity); userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); + userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否,1-是) 认证失败:0 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); } else { UpdateWrapper partyUpdate = new UpdateWrapper<>(); @@ -543,6 +543,7 @@ public class UserServiceImpl extends BaseServiceImpl implem this.partyMembersDao.update(partyMembersEntity, partyUpdate); userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value()); + userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否,1-是) 认证失败:0 } //插入用户认证历史表 userAuthenticateHistoryEntity.setUserId(userId); @@ -662,6 +663,8 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) { +// authenticatedFlag是否已认证 0否 1是 +// partyFlag 是否党员,0否,1是 int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize(); workUserFromDto.setPageIndex(pageIndex); @@ -678,6 +681,10 @@ public class UserServiceImpl extends BaseServiceImpl implem // 查询认证失败的党员 if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) { state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value(); + workUserFromDto.setAuthenticatedFlag(state); + workUserFromDto.setPartyFlag(YesOrNoEnum.NO.value()); + List epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto); + return new Result>().ok(epdcWorkUserResultDTOS); } workUserFromDto.setAuthenticatedFlag(state); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 38fb20451..0bd225d9e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -317,5 +317,39 @@ + +