根据通知分享Id查询数据接口添加返参

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{}
 }

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";
 
 }

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<GetInvitationResultDTO> getInvitation(@RequestBody GetInvitationFormDTO formDTO) {
+    public Result<GetInvitationResultDTO> getInvitation(@LoginUser TokenDto tokenDto, @RequestBody GetInvitationFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, GetInvitationFormDTO.Invitation.class);
+        formDTO.setUserId(tokenDto.getUserId());
         return new Result<GetInvitationResultDTO>().ok(invitationRecordService.getInvitation(formDTO));
     }
 

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<InvitationRecordEnt
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 通知、活动分享Id查询数据
+     * @Description 根据通知分享Id查询数据
      **/
     GetInvitationResultDTO getInvitation(GetInvitationFormDTO formDTO);
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.modules.invitation.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.modules.act.dao.GroupActInfoDao;
@@ -25,6 +26,7 @@ import com.epmet.modules.act.entity.GroupActInfoEntity;
 import com.epmet.modules.invitation.dao.InvitationRecordDao;
 import com.epmet.modules.invitation.entity.InvitationRecordEntity;
 import com.epmet.modules.invitation.service.InvitationRecordService;
+import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.notice.dao.NoticeDao;
 import com.epmet.modules.notice.entity.NoticeEntity;
 import com.epmet.resi.group.dto.invitation.InvitationRecordDTO;
@@ -48,6 +50,8 @@ public class InvitationRecordServiceImpl extends BaseServiceImpl<InvitationRecor
     private NoticeDao noticeDao;
     @Autowired
     private GroupActInfoDao groupActInfoDao;
+    @Autowired
+    private ResiGroupMemberDao resiGroupMemberDao;
 
 
     /**
@@ -97,16 +101,22 @@ public class InvitationRecordServiceImpl extends BaseServiceImpl<InvitationRecor
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 通知、活动分享Id查询数据
+     * @Description 根据通知分享Id查询数据
      **/
     @Override
     public GetInvitationResultDTO getInvitation(GetInvitationFormDTO formDTO) {
-        //查询通知、活动分享表数据
+        //1.查询通知、活动分享表数据
         InvitationRecordEntity entity = baseDao.selectById(formDTO.getInvitationRecordId());
         if (null == entity) {
-            throw new RenException(String.format("根据分享Id查询数据失败，分享Id->", 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;
     }