Browse Source

修改用户注册或绑定网格接口,添加记录邀请记录

dev
liuchuang 6 years ago
parent
commit
92b7b6b8db
  1. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java
  2. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  3. 5
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java
  4. 17
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

5
esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java

@ -28,4 +28,9 @@ public class EpdcAppUserRegisterFormDTO implements Serializable {
*/ */
@NotNull(message = "网格ID不能为空") @NotNull(message = "网格ID不能为空")
private Long gridId; private Long gridId;
/**
* 邀请人ID
*/
private String inviteUserId;
} }

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -657,7 +657,7 @@ public class AppUserServiceImpl implements AppUserService {
// IP地址 // IP地址
HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
return this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request)); return this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId());
} }
/** /**
@ -668,7 +668,7 @@ public class AppUserServiceImpl implements AppUserService {
* @author liuchuang * @author liuchuang
* @since 2019/10/25 12:49 * @since 2019/10/25 12:49
*/ */
private Result<EpdcAppAuthorizationDTO> dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress) { private Result<EpdcAppAuthorizationDTO> dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress, String inviteUserId) {
EpdcUserRegisterBindGridFormDTO registerBindGridFormDto = new EpdcUserRegisterBindGridFormDTO(); EpdcUserRegisterBindGridFormDTO registerBindGridFormDto = new EpdcUserRegisterBindGridFormDTO();
// 用户注册状态 0-未注册未绑定网格,1-已注册未绑定当前网格,2-已注册已绑定当前网格 // 用户注册状态 0-未注册未绑定网格,1-已注册未绑定当前网格,2-已注册已绑定当前网格
Integer registerState = userResult.getRegisterState(); Integer registerState = userResult.getRegisterState();
@ -690,6 +690,7 @@ public class AppUserServiceImpl implements AppUserService {
if (NumConstant.TWO != registerState) { if (NumConstant.TWO != registerState) {
// 组装用户关联网格信息 // 组装用户关联网格信息
registerBindGridFormDto.setGridRelationDTO(this.packageUserGridRelationInfo(gridId)); registerBindGridFormDto.setGridRelationDTO(this.packageUserGridRelationInfo(gridId));
registerBindGridFormDto.setInviteUserId(inviteUserId);
// 用户并绑定网格 // 用户并绑定网格
Result<EpdcUserRegisterInfoResultDTO> registerBindGridResultDto = userFeignClient.registerOrBindGrid(registerBindGridFormDto); Result<EpdcUserRegisterInfoResultDTO> registerBindGridResultDto = userFeignClient.registerOrBindGrid(registerBindGridFormDto);
if (!registerBindGridResultDto.success()) { if (!registerBindGridResultDto.success()) {

5
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java

@ -28,4 +28,9 @@ public class EpdcUserRegisterBindGridFormDTO implements Serializable {
* 关联网格信息 * 关联网格信息
*/ */
private UserGridRelationDTO gridRelationDTO; private UserGridRelationDTO gridRelationDTO;
/**
* 邀请人ID
*/
private String inviteUserId;
} }

17
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -52,6 +52,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
import com.elink.esua.epdc.enums.AppUserStatesEnum; import com.elink.esua.epdc.enums.AppUserStatesEnum;
import com.elink.esua.epdc.service.UserGridRelationService; import com.elink.esua.epdc.service.UserGridRelationService;
import com.elink.esua.epdc.service.UserInvitationRecordService;
import com.elink.esua.epdc.service.UserService; import com.elink.esua.epdc.service.UserService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -78,6 +79,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
@Autowired @Autowired
private UserAuthenticateHistoryDao userAuthenticateHistoryDao; private UserAuthenticateHistoryDao userAuthenticateHistoryDao;
@Autowired
private UserInvitationRecordService userInvitationRecordService;
@Override @Override
public PageData<UserDTO> page(Map<String, Object> params) { public PageData<UserDTO> page(Map<String, Object> params) {
this.verifyParams(params); this.verifyParams(params);
@ -412,6 +416,19 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
resultDto.setGridId(userGridRel.getGridId()); resultDto.setGridId(userGridRel.getGridId());
resultDto.setUserDTO(formUserDto); resultDto.setUserDTO(formUserDto);
// 记录邀请记录
if (StringUtils.isNotEmpty(fromDto.getInviteUserId())) {
UserInvitationRecordEntity entity = new UserInvitationRecordEntity();
entity.setUserId(formUserDto.getId());
entity.setInviteUserId(fromDto.getInviteUserId());
// 获取用户信息
UserDTO userDto = this.get(formUserDto.getId());
entity.setRegisterTime(userDto.getRegisterTime());
entity.setGrid(userGridRel.getGrid());
entity.setGridId(userGridRel.getGridId());
userInvitationRecordService.insert(entity);
}
return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto); return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
} }

Loading…
Cancel
Save