群二维码变为invitationId

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

@@ -41,6 +41,8 @@ import com.epmet.modules.group.dao.ResiGroupCodeDao;
 import com.epmet.modules.group.entity.ResiGroupCodeEntity;
 import com.epmet.modules.group.redis.ResiGroupCodeRedis;
 import com.epmet.modules.group.service.ResiGroupCodeService;
+import com.epmet.modules.group.service.ResiGroupService;
+import com.epmet.modules.invitation.service.GroupInvitationService;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.GroupCodeConstant;
 import com.epmet.resi.group.dto.QRCodeMultipartFileDTO;
@@ -49,6 +51,8 @@ import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
+import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
 import com.epmet.utils.ThirdUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -82,6 +86,12 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
     @Autowired
     private ExecutorService executorService;
 
+    @Autowired
+    private GroupInvitationService groupInvitationService;
+
+    @Autowired
+    private ResiGroupService resiGroupService;
+
     @Override
     public PageData<ResiGroupCodeDTO> page(Map<String, Object> params) {
         IPage<ResiGroupCodeEntity> page = baseDao.selectPage(
@@ -213,7 +223,14 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
             }
             //跳转的页面
             StringBuilder path = new StringBuilder(ModuleConstant.CODE_INVITE_PAGE);
-            path.append("?groupId=").append(dto.getGroupId());
+            //获取invitationId
+            CreateGroupInvitationFormDTO invitationFormDTO = new CreateGroupInvitationFormDTO();
+            //获取群主userId
+            invitationFormDTO.setUserId(resiGroupService.get(dto.getGroupId()).getCreatedBy());
+            invitationFormDTO.setGroupId(dto.getGroupId());
+            CreateGroupInvitationResultDTO groupScanCodeInvitation = groupInvitationService.createGroupScanCodeInvitation(invitationFormDTO);
+            path.append("?invitationId=").append(groupScanCodeInvitation.getInvitationId());
+
             //需要发送的Json
             JSONObject data = new JSONObject();
             data.put("path", path.toString());

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

@@ -103,11 +103,20 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
      * @param formDTO
      * @Author yinzuomei
-     * @Description 生成邀请连接
+     * @Description 生成邀请连接-链接
      * @Date 2020/3/31 22:50
      **/
 	CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
+     * @param formDTO
+     * @Author liushaowen
+     * @Description 生成邀请连接-扫码
+     * @Date 2020-11-17 13:58
+     **/
+    CreateGroupInvitationResultDTO createGroupScanCodeInvitation(CreateGroupInvitationFormDTO formDTO);
+
 	/**
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
 	 * @param formDTO

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

@@ -188,6 +188,40 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		return resultDTO;
 	}
 
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
+	 * @Author liushaowen
+	 * @Description 生成邀请连接-扫码
+	 * @Date 2020-11-17 13:58
+	 **/
+	@Override
+	public CreateGroupInvitationResultDTO createGroupScanCodeInvitation(CreateGroupInvitationFormDTO formDTO) {
+		//1、只有群主可以邀请新成员（这块界面限制死了，只有群主才能看到邀请新成员按钮）
+		//2、审核通过（讨论中）的群才可以分享邀请连接
+		ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
+		if (!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
+			logger.error(String.format("生成群成员链接失败,原因:%s",EpmetErrorCode.INVITE_NEW_MEMBER.getMsg()));
+			throw new RenException(EpmetErrorCode.INVITE_NEW_MEMBER.getCode());
+		}
+		//3、插入一条邀请记录
+		GroupInvitationEntity groupInvitationEntity = new GroupInvitationEntity();
+		groupInvitationEntity.setInviterUserId(formDTO.getUserId());
+		groupInvitationEntity.setInviterCustomerId(resiGroupDTO.getCustomerId());
+		groupInvitationEntity.setInviterGridId(resiGroupDTO.getGridId());
+		//添加类型字段 scancode
+		groupInvitationEntity.setInvitationType(GroupStateConstant.GROUP_SCANCODE);
+		//暂定50年有效期
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + NumConstant.FIFTY);
+		groupInvitationEntity.setValidEndTime(calendar.getTime());
+		groupInvitationEntity.setResiGroupId(formDTO.getGroupId());
+		insert(groupInvitationEntity);
+		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
+		resultDTO.setInvitationId(groupInvitationEntity.getId());
+		return resultDTO;
+	}
+
 	/**
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>