From 9ede5cee809db85ad0e3f1ac495feb4bda37c12c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 10:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=80=9A=E7=9F=A5=E5=88=86?= =?UTF-8?q?=E4=BA=ABId=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invitation/form/GetInvitationFormDTO.java | 6 +++++- .../result/GetInvitationResultDTO.java | 6 +++++- .../controller/InvitationRecordController.java | 5 +++-- .../service/InvitationRecordService.java | 2 +- .../impl/InvitationRecordServiceImpl.java | 16 +++++++++++++--- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java index 7b6975eb89..36cf7b60d4 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank; /** * @Author sun - * @Description 通知、活动分享Id查询数据-接口入参 + * @Description 根据通知分享Id查询数据-接口入参 */ @Data public class GetInvitationFormDTO { @@ -16,6 +16,10 @@ public class GetInvitationFormDTO { */ @NotBlank(message = "分享Id不能为空",groups = {GetInvitationFormDTO.Invitation.class}) private String invitationRecordId; + /** + * token中用户Id + */ + private String userId; public interface Invitation{} } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java index 24f2a708f2..4b44e638e7 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java @@ -6,7 +6,7 @@ import java.io.Serializable; /** * @Author sun - * @Description 通知、活动分享Id查询数据-接口返参 + * @Description 根据通知分享Id查询数据-接口返参 */ @Data public class GetInvitationResultDTO implements Serializable { @@ -36,5 +36,9 @@ public class GetInvitationResultDTO implements Serializable { * notice:通知 act:活动 */ private String shareUserId; + /** + * 当前人员是否在组内:yes；不在组内：no + */ + private String inGroup = "yes"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java index 05cd2d035a..0e20a8b391 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java @@ -64,11 +64,12 @@ public class InvitationRecordController { * @param formDTO * @return * @Author sun - * @Description 通知、活动分享Id查询数据 + * @Description 根据通知分享Id查询数据 **/ @PostMapping(value = "getinvitation") - public Result getInvitation(@RequestBody GetInvitationFormDTO formDTO) { + public Result getInvitation(@LoginUser TokenDto tokenDto, @RequestBody GetInvitationFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, GetInvitationFormDTO.Invitation.class); + formDTO.setUserId(tokenDto.getUserId()); return new Result().ok(invitationRecordService.getInvitation(formDTO)); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java index e3a243c72d..581dc1c9c4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java @@ -45,7 +45,7 @@ public interface InvitationRecordService extends BaseService", formDTO.getInvitationRecordId())); + throw new RenException(String.format("根据通知分享Id查询数据失败，分享Id->", formDTO.getInvitationRecordId())); } GetInvitationResultDTO resultDTO = ConvertUtils.sourceToTarget(entity, GetInvitationResultDTO.class); + + //2.判断当前人员是否在组内 + int num = resiGroupMemberDao.checkUserInGroup(formDTO.getUserId(), entity.getGroupId()); + if (num < NumConstant.ONE) { + resultDTO.setInGroup("no"); + } return resultDTO; }