Browse Source

退群加个注释

dev
yinzuomei 4 years ago
parent
commit
f1605f009a
  1. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java
  2. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ExitGroupController.java
  3. 3
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java
  4. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/ResiGroupMemberEntity.java

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java

@ -65,7 +65,7 @@ public class ResiGroupMemberDTO implements Serializable {
private String groupInvitationId;
/**
* 状态 审核通过 - approved 已禁言 - silent 被移出群 - removed
* 状态 审核通过 - approved 已禁言 - silent 被移出群 - removedexit退群
*/
private String status;

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ExitGroupController.java

@ -1,6 +1,7 @@
package com.epmet.modules.group.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
@ -54,6 +55,7 @@ public class ExitGroupController {
* @description 组员自主退群
* @Date 2021/4/30 15:09
**/
@NoRepeatSubmit
@PostMapping("memexitgroup")
public Result memExitGroup(@LoginUser TokenDto tokenDto, @RequestBody MemExitGroupFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());

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

@ -2,6 +2,7 @@ package com.epmet.modules.group.service.impl;
import com.epmet.commons.tools.constant.*;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.UserRoleFormDTO;
@ -223,7 +224,7 @@ public class ExitGroupServiceImpl implements ExitGroupService {
//1、当前组员是否还在群里?
ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberDao.selectGroupMemberInfo(formDTO.getGroupId(),formDTO.getUserId());
if(null == resiGroupMemberDTO){
throw new RenException("已退出当前小组,请勿重复操作");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "已退出当前小组,请勿重复操作","已退出当前小组,请勿重复操作");
}
//2、组长不允许退群,提示:请先转移组长身份后再退组
if(ModuleConstant.GROUP_LEADER.equals(resiGroupMemberDTO.getGroupLeaderFlag())){

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/ResiGroupMemberEntity.java

@ -63,7 +63,7 @@ public class ResiGroupMemberEntity extends BaseEpmetEntity {
private String groupInvitationId;
/**
* 状态 审核通过 - approved 已禁言 - silent 被移出群 - removed
* 状态 审核通过 - approved 已禁言 - silent 被移出群 - removedexit退群
*/
private String status;

Loading…
Cancel
Save