|
|
|
@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl; |
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaService; |
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; |
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; |
|
|
|
import com.elink.esua.epdc.async.GroupTask; |
|
|
|
import com.elink.esua.epdc.common.token.dto.TokenDto; |
|
|
|
import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; |
|
|
|
import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
|
@ -11,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
|
import com.elink.esua.epdc.commons.tools.redis.RedisUtils; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.*; |
|
|
|
import com.elink.esua.epdc.dto.*; |
|
|
|
import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; |
|
|
|
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; |
|
|
|
@ -20,6 +22,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.form.*; |
|
|
|
import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO; |
|
|
|
import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; |
|
|
|
import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; |
|
|
|
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; |
|
|
|
import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; |
|
|
|
@ -83,7 +87,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
private RedisUtils redisUtils; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private GroupFeignClient groupFeignClient; |
|
|
|
private GroupTask groupTask; |
|
|
|
|
|
|
|
|
|
|
|
private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png"; |
|
|
|
@ -218,6 +222,9 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
|
|
|
|
EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); |
|
|
|
|
|
|
|
// 网格长加入网格党员群并设置为群主
|
|
|
|
this.joinGridPartyGroup(newAppUser, NumConstant.ONE_STR); |
|
|
|
|
|
|
|
return new Result().ok(authorization); |
|
|
|
} |
|
|
|
|
|
|
|
@ -626,6 +633,10 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
} |
|
|
|
userResult = registerBindGridResultDto.getData(); |
|
|
|
registeredUser = userResult.getUserDTO(); |
|
|
|
// 用户已认证为党员，绑定网格时加入该网格党员群
|
|
|
|
if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { |
|
|
|
this.joinGridPartyGroup(registeredUser, NumConstant.ZERO_STR); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 已注册已绑定当前网格
|
|
|
|
@ -710,11 +721,19 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
tokenDto.setPartyFlag(user.getPartyFlag()); |
|
|
|
EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState()); |
|
|
|
|
|
|
|
// 更新社群用户党员标识
|
|
|
|
GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); |
|
|
|
formDto.setUserId(user.getId()); |
|
|
|
formDto.setPartyMember(user.getPartyFlag()); |
|
|
|
groupFeignClient.updateUserPartyMember(formDto); |
|
|
|
// 更新社群用户党员标识并加入关联的所有网格党员群
|
|
|
|
if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { |
|
|
|
GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); |
|
|
|
formDto.setUserId(user.getId()); |
|
|
|
formDto.setPartyMember(user.getPartyFlag()); |
|
|
|
formDto.setNickname(user.getNickname()); |
|
|
|
formDto.setUserAvatar(user.getFaceImg()); |
|
|
|
formDto.setMobile(user.getMobile()); |
|
|
|
formDto.setDeptId(user.getGridId()); |
|
|
|
formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); |
|
|
|
|
|
|
|
groupTask.updateUserPartyMember(formDto); |
|
|
|
} |
|
|
|
|
|
|
|
return new Result().ok(authorizationDto); |
|
|
|
} |
|
|
|
@ -847,4 +866,26 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* |
|
|
|
* 用户加入网格党员群 |
|
|
|
* |
|
|
|
* @params [userDto, lordFlag] |
|
|
|
* @return void |
|
|
|
* @author liuchuang |
|
|
|
* @since 2019/11/21 10:58 |
|
|
|
*/ |
|
|
|
private void joinGridPartyGroup(UserDTO userDto, String lordFlag) { |
|
|
|
GroupUserFormDTO formDto = new GroupUserFormDTO(); |
|
|
|
formDto.setUserId(userDto.getId()); |
|
|
|
formDto.setNickname(userDto.getNickname()); |
|
|
|
formDto.setUserAvatar(userDto.getFaceImg()); |
|
|
|
formDto.setMobile(userDto.getMobile()); |
|
|
|
formDto.setPartyMember(userDto.getPartyFlag()); |
|
|
|
formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); |
|
|
|
formDto.setLordFlag(lordFlag); |
|
|
|
formDto.setGridId(userDto.getGridId()); |
|
|
|
groupTask.joinGridPartyGroup(formDto); |
|
|
|
} |
|
|
|
} |
|
|
|
|
王金鹏
6 years ago