zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev:app端注销账号

main
SondonYong 2025-12-05 09:37:08 +08:00
parent 2f839eaca4
commit 73eb9c4db1
8 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java
View File

@ -83,6 +83,13 @@ public class AppUserController {
return SingleResponse.of(userService.updatePasswordFromApp(cmd));
}
@ApiOperation("校验是否还有入职信息")
@PostMapping("/checkOnboarding")
public Response checkOnboarding(@Validated @RequestBody AppUserLogOutCmd cmd){
userService.checkOnboarding(cmd);
return SingleResponse.buildSuccess();
}
@ApiOperation("注销")
@PostMapping("/logOut")
public Response logOut(@Validated @RequestBody AppUserLogOutCmd cmd){

2
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -149,7 +149,7 @@ public class UserAddExe {
/**
* 如果是离职的话, 则将离职改为入职
*/
List<UserCorpDO> userCorpDOS = userCorpRepository.listByUserIdAndCorpIdAndNoStatus(cmd.getId(), cmd.getCorpinfoId(), 0);
List<UserCorpDO> userCorpDOS = userCorpRepository.listByUserIdAndCorpIdAndStatus(cmd.getId(), cmd.getCorpinfoId(), 0);
if(CollUtil.isNotEmpty(userCorpDOS)){
throw new BizException("该用户在当前企业存在未离职信息，无法入职");
}

31
web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
View File

@ -1,10 +1,15 @@
package com.zcloud.basic.info.command;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.system.client.user.facade.UserFacade;
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
import com.zcloud.basic.info.domain.gateway.UserGateway;
import com.zcloud.basic.info.dto.AppUserLogOutCmd;
import com.zcloud.basic.info.persistence.dataobject.UserCorpDO;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
import com.zcloud.basic.info.persistence.repository.UserCorpRepository;
import com.zcloud.basic.info.persistence.repository.UserRepository;
import com.zcloud.gbscommon.utils.Const;
import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
import lombok.AllArgsConstructor;
@ -14,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
@ -26,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class UserRemoveExe {
private final UserGateway userGateway;
private final UserRepository userRepository;
private final UserCorpRepository userCorpRepository;
@DubboReference(check = false)
private UserFacade userFacade;
@ -46,6 +52,14 @@ public class UserRemoveExe {
@Transactional(rollbackFor = Exception.class)
public boolean execute(AppUserLogOutCmd cmd) {
// 获取redis验证码
// Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + cmd.getPhone());
// if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){
// throw new BizException("验证码已过期或错误");
// }
// zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + cmd.getPhone());
try {
// 删除底座用户信息
userFacade.delete(cmd.getId());
@ -58,7 +72,20 @@ public class UserRemoveExe {
e.printStackTrace();
throw new BizException("删除失败");
}
// zcloudRedisUtil.del(Const.REDIS_USER_PREFIX+id);
return true;
}
@Transactional(rollbackFor = Exception.class)
public boolean executeCheckOnboarding(AppUserLogOutCmd cmd) {
// 校验是否还有入职信息
UserDO userDO = userRepository.getInfoById(cmd.getId());
if(!UserEmploymentFlagEnum.RESIGNATION.equals(userDO.getEmploymentFlag().toString())){
return false;
}
List<UserCorpDO> userCorpDOS = userCorpRepository.listByUserIdAndNoStatus(cmd.getId(), 0);
if(CollUtil.isNotEmpty(userCorpDOS)){
return false;
}
return true;
}

5
web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java
View File

@ -202,5 +202,10 @@ public class UserServiceImpl implements UserServiceI {
public void logOut(AppUserLogOutCmd cmd) {
userRemoveExe.execute(cmd);
}
@Override
public void checkOnboarding(AppUserLogOutCmd cmd) {
userRemoveExe.executeCheckOnboarding(cmd);
}
}

2
web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java
View File

@ -79,5 +79,7 @@ public interface UserServiceI {
Boolean updatePasswordFromApp(AppUserUpdatePassWordCmd cmd);
void logOut(AppUserLogOutCmd cmd);
void checkOnboarding(AppUserLogOutCmd cmd);
}

3
web-client/src/main/java/com/zcloud/basic/info/dto/AppUserResignationCmd.java
View File

@ -30,8 +30,7 @@ public class AppUserResignationCmd implements Serializable {
@NotNull(message = "企业id不能为空")
private Long corpinfoId;
//离职原因
@ApiModelProperty(value = "离职原因", name = "resignationReason", required = true)
@NotEmpty(message = "离职原因不能为空")
@ApiModelProperty(value = "离职原因", name = "resignationReason")
private String resignationReason;

2
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
View File

@ -25,6 +25,8 @@ public interface UserCorpRepository extends BaseRepository<UserCorpDO> {
List<UserCorpDO> listByUserIdAndCorpIdAndStatus(Long userId, Long corpinfoId, Integer status);
List<UserCorpDO> listByUserIdAndNoStatus(Long userId, Integer status);
UserE executeResignation(UserCorpDO userCorpDO, Long corpinfoId, Integer employmentFlag);
UserE executeReviewStatus(Long id, Long corpinfoId, Integer reviewStatus);

8
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
View File

@ -71,6 +71,14 @@ public class UserCorpRepositoryImpl extends BaseRepositoryImpl<UserCorpMapper, U
return list(queryWrapper);
}
@Override
public List<UserCorpDO> listByUserIdAndNoStatus(Long userId, Integer status) {
QueryWrapper<UserCorpDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userId);
queryWrapper.ne("employment_flag", status);
return list(queryWrapper);
}
@Override
public UserE executeResignation(UserCorpDO userCorpDO, Long corpinfoId, Integer employmentFlag) {
userCorpDO.setEmploymentFlag(employmentFlag);