From 92b7b6b8db8a5e38470d0d7cf8f8e5660afdd4ad Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 3 Dec 2019 09:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=88=96=E7=BB=91=E5=AE=9A=E7=BD=91=E6=A0=BC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EpdcAppUserRegisterFormDTO.java | 5 +++++ .../epdc/service/impl/AppUserServiceImpl.java | 5 +++-- .../form/EpdcUserRegisterBindGridFormDTO.java | 5 +++++ .../esua/epdc/service/impl/UserServiceImpl.java | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java index 42bd6cf74..937dcd476 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java +++ b/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不能为空") private Long gridId; + + /** + * 邀请人ID + */ + private String inviteUserId; } 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 6a34b999d..bd60ddfa0 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 @@ -657,7 +657,7 @@ public class AppUserServiceImpl implements AppUserService { // IP地址 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 * @since 2019/10/25 12:49 */ - private Result dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress) { + private Result dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress, String inviteUserId) { EpdcUserRegisterBindGridFormDTO registerBindGridFormDto = new EpdcUserRegisterBindGridFormDTO(); // 用户注册状态 0-未注册未绑定网格，1-已注册未绑定当前网格，2-已注册已绑定当前网格 Integer registerState = userResult.getRegisterState(); @@ -690,6 +690,7 @@ public class AppUserServiceImpl implements AppUserService { if (NumConstant.TWO != registerState) { // 组装用户关联网格信息 registerBindGridFormDto.setGridRelationDTO(this.packageUserGridRelationInfo(gridId)); + registerBindGridFormDto.setInviteUserId(inviteUserId); // 用户并绑定网格 Result registerBindGridResultDto = userFeignClient.registerOrBindGrid(registerBindGridFormDto); if (!registerBindGridResultDto.success()) { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java index f82f15154..8e3458e8b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java +++ b/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; + + /** + * 邀请人ID + */ + private String inviteUserId; } 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 20b428ff6..c75ce1af7 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 @@ -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.AppUserStatesEnum; import com.elink.esua.epdc.service.UserGridRelationService; +import com.elink.esua.epdc.service.UserInvitationRecordService; import com.elink.esua.epdc.service.UserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -78,6 +79,9 @@ public class UserServiceImpl extends BaseServiceImpl implem @Autowired private UserAuthenticateHistoryDao userAuthenticateHistoryDao; + @Autowired + private UserInvitationRecordService userInvitationRecordService; + @Override public PageData page(Map params) { this.verifyParams(params); @@ -412,6 +416,19 @@ public class UserServiceImpl extends BaseServiceImpl implem resultDto.setGridId(userGridRel.getGridId()); 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().ok(resultDto); }