From d0cf2cb2c352bdeb146aad2bb57ba7d39cef3bbd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 17:59:04 +0800
Subject: [PATCH] 完善会员审批及门户配置
---
yudao-module-ums/src/main/java/cn/iocoder/yudao/module/ums/service/member/UmsMemberServiceImpl.java | 143 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 136 insertions(+), 7 deletions(-)
diff --git a/yudao-module-ums/src/main/java/cn/iocoder/yudao/module/ums/service/member/UmsMemberServiceImpl.java b/yudao-module-ums/src/main/java/cn/iocoder/yudao/module/ums/service/member/UmsMemberServiceImpl.java
index c84cefe..77c45b0 100644
--- a/yudao-module-ums/src/main/java/cn/iocoder/yudao/module/ums/service/member/UmsMemberServiceImpl.java
+++ b/yudao-module-ums/src/main/java/cn/iocoder/yudao/module/ums/service/member/UmsMemberServiceImpl.java
@@ -1,15 +1,25 @@
package cn.iocoder.yudao.module.ums.service.member;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.archive.api.document.ArchiveDocumentApi;
+import cn.iocoder.yudao.module.archive.api.document.dto.ArchiveDocumentCreateReqDTO;
+import cn.iocoder.yudao.module.archive.api.document.dto.ArchiveDocumentRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserCreateReqDTO;
+import cn.iocoder.yudao.module.system.service.social.SocialUserService;
+import cn.iocoder.yudao.module.system.service.permission.RoleService;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.module.ums.controller.admin.member.vo.UmsMemberPageReqVO;
import cn.iocoder.yudao.module.ums.controller.admin.member.vo.UmsMemberSaveReqVO;
import cn.iocoder.yudao.module.ums.dal.dataobject.application.UmsApplicationDO;
import cn.iocoder.yudao.module.ums.dal.dataobject.member.UmsMemberDO;
+import cn.iocoder.yudao.module.ums.dal.mysql.application.UmsApplicationMapper;
import cn.iocoder.yudao.module.ums.dal.mysql.member.UmsMemberMapper;
import cn.iocoder.yudao.module.ums.dal.redis.UmsNoRedisDAO;
import jakarta.annotation.Resource;
@@ -20,7 +30,10 @@
import java.time.LocalDate;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.ums.enums.ErrorCodeConstants.*;
@@ -35,10 +48,33 @@
*/
private static final Long MEMBER_DEPT_ID = 129L;
+ /**
+ * 浼佷笟寰俊鎵爜鐢ㄦ埛瑙掕壊缂栫爜锛涙寜缂栫爜鏌ヨ锛岄伩鍏嶄笉鍚岀幆澧冭鑹茬紪鍙蜂笉涓�鑷淬��
+ */
+ private static final String MEMBER_ROLE_CODE = "wxcp_user";
+
public static final String MEMBER_RECORD_TYPE = "ums_member";
+
+ /** 浼氬憳鐘舵�侊細姝ｅ父锛堝彲褰掓。锛� */
+ private static final Integer MEMBER_STATUS_NORMAL = 1;
+
+ /** 褰掓。鏉ユ簮绫诲瀷锛�3-浼氬憳锛堝搴� archive 妯″潡 source_type锛� */
+ private static final Integer ARCHIVE_SOURCE_TYPE_MEMBER = 3;
+
+ /** 褰掓。瀵嗙骇锛�2-鍐呴儴 */
+ private static final Integer ARCHIVE_SECRET_LEVEL_INTERNAL = 2;
+
+ /** 浼氬憳妗ｆ鍒嗙被缂栫爜锛堝搴� archive_category.code锛� */
+ private static final String ARCHIVE_CATEGORY_CODE_MEMBER = "member";
@Resource
private UmsMemberMapper memberMapper;
+ @Resource
+ private UmsApplicationMapper applicationMapper;
+ @Resource
+ private SocialUserService socialUserService;
+ @Resource
+ private RoleService roleService;
@Resource
private UmsNoRedisDAO noRedisDAO;
@@ -49,9 +85,14 @@
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private ArchiveDocumentApi archiveDocumentApi;
+
@Override
@Transactional(rollbackFor = Exception.class)
public UmsMemberDO createMemberFromApplication(UmsApplicationDO application) {
+ UmsMemberDO existing = memberMapper.selectByApplicationId(application.getId());
+ if (existing != null) return existing;
// 1. 鐢熸垚浼氬憳缂栧彿
String no = noRedisDAO.generate(UmsNoRedisDAO.MEMBER_NO_PREFIX);
if (memberMapper.selectByNo(no) != null) {
@@ -60,6 +101,9 @@
// 2. 鍒涘缓绯荤粺鐢ㄦ埛璐﹀彿
Long userId = createSystemUser(application);
+ if (StrUtil.isNotBlank(application.getWxcpOpenid())) {
+ socialUserService.bindApprovedWxcpUser(application.getWxcpOpenid(), userId);
+ }
// 3. 鍒涘缓浼氬憳璁板綍
UmsMemberDO member = UmsMemberDO.builder()
@@ -68,6 +112,8 @@
.applicationId(application.getId())
.memberType(application.getMemberType())
.memberGrade(application.getMemberGrade())
+ .feePaid(application.getFeePaid())
+ .passwordSetupRequired(StrUtil.isBlank(application.getContactPhone()))
.name(application.getApplicantName())
.contactPhone(application.getContactPhone())
.contactEmail(application.getContactEmail())
@@ -96,6 +142,7 @@
// 浼氬憳绛夌骇涓庣被鍨嬪尮閰嶆牎楠�
validateMemberGrade(createReqVO.getMemberType(), createReqVO.getMemberGrade());
+ validateFeePaid(createReqVO);
UmsMemberDO member = BeanUtils.toBean(createReqVO, UmsMemberDO.class, in -> in
.setNo(no)
@@ -112,11 +159,27 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMember(UmsMemberSaveReqVO updateReqVO) {
- validateMemberExists(updateReqVO.getId());
+ UmsMemberDO existingMember = validateMemberExists(updateReqVO.getId());
validateMemberGrade(updateReqVO.getMemberType(), updateReqVO.getMemberGrade());
+ validateFeePaid(updateReqVO);
+
+ // 鍙栨秷銆屽凡缂寸撼浼氳垂銆嶆椂闇�瑕佹妸缂磋垂骞村害鐪熸娓呯┖锛坲pdateById 浼氬拷鐣� null 瀛楁锛�
+ boolean clearFeeYear = Boolean.FALSE.equals(updateReqVO.getFeePaid());
+ if (clearFeeYear) {
+ updateReqVO.setFeeYear(null);
+ }
UmsMemberDO updateObj = BeanUtils.toBean(updateReqVO, UmsMemberDO.class);
memberMapper.updateById(updateObj);
+ if (existingMember.getApplicationId() != null && updateReqVO.getFeePaid() != null) {
+ applicationMapper.updateById(new UmsApplicationDO()
+ .setId(existingMember.getApplicationId()).setFeePaid(updateReqVO.getFeePaid()));
+ }
+ if (clearFeeYear) {
+ memberMapper.update(null, new LambdaUpdateWrapper<UmsMemberDO>()
+ .eq(UmsMemberDO::getId, updateReqVO.getId())
+ .set(UmsMemberDO::getFeeYear, null));
+ }
storageAttachmentApi.updateAttachments("file", MEMBER_RECORD_TYPE,
updateReqVO.getId(), updateReqVO.getBlobIds());
@@ -145,13 +208,56 @@
return memberMapper.selectPage(pageReqVO);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public String archiveMember(Long id) {
+ // 1.1 鏍￠獙浼氬憳瀛樺湪
+ UmsMemberDO member = validateMemberExists(id);
+ // 1.2 鍙湁銆屾甯搞�嶇姸鎬佺殑浼氬憳鎵嶈兘褰掓。
+ if (!MEMBER_STATUS_NORMAL.equals(member.getStatus())) {
+ throw exception(MEMBER_ARCHIVE_FAIL_STATUS, member.getNo(), memberStatusName(member.getStatus()));
+ }
+ // 1.3 閲嶅褰掓。鏍￠獙
+ if (member.getArchiveDocumentId() != null) {
+ throw exception(MEMBER_ALREADY_ARCHIVED, member.getNo(),
+ StrUtil.blankToDefault(archiveNo(id), "鏈煡"));
+ }
+
+ // 2. 甯﹀叆浼氬憳鏉愭枡闄勪欢锛屾寜鏉ユ簮鍗曟嵁褰掓。
+ List<Long> blobIds = storageAttachmentApi.listAttachments(MEMBER_RECORD_TYPE, id).stream()
+ .map(StorageBlobRespDTO::getId).collect(Collectors.toList());
+ Long archiveDocumentId = archiveDocumentApi.archiveBySource(new ArchiveDocumentCreateReqDTO()
+ .setSourceType(ARCHIVE_SOURCE_TYPE_MEMBER)
+ .setSourceId(id)
+ .setSourceNo(member.getNo())
+ .setSourceTitle(member.getName())
+ .setCategoryCode(ARCHIVE_CATEGORY_CODE_MEMBER)
+ .setSecretLevel(ARCHIVE_SECRET_LEVEL_INTERNAL)
+ .setSummary("浼氬憳鏉愭枡褰掓。")
+ .setBlobIds(blobIds)).getCheckedData();
+
+ // 3. 鍥炲啓褰掓。妗ｆ ID锛堜綔涓哄凡褰掓。纭爣璁帮級
+ memberMapper.updateById(new UmsMemberDO().setId(id).setArchiveDocumentId(archiveDocumentId));
+ return StrUtil.blankToDefault(archiveNo(id), "鏈煡");
+ }
+
// =================== 鍐呴儴鏂规硶 ===================
private Long createSystemUser(UmsApplicationDO application) {
// 鎵嬫満鍙峰彲浣滀负鐢ㄦ埛鍚�/瀵嗙爜锛堝弬鑰� HRM 鍛樺伐妯″紡锛�
- String mobile = StrUtil.blankToDefault(application.getContactPhone(), "unknown");
- String username = mobile;
- String nickname = application.getApplicantName();
+ String mobile = StrUtil.trim(application.getContactPhone());
+ if ((StrUtil.isBlank(mobile) && StrUtil.isBlank(application.getWxcpOpenid()))
+ || (StrUtil.isNotBlank(mobile) && !mobile.matches("^1[3-9]\\d{9}$"))) {
+ throw exception(APPLICATION_WXCP_INFO_REQUIRED);
+ }
+ RoleDO role = roleService.getRoleByCode(MEMBER_ROLE_CODE);
+ if (role == null || CommonStatusEnum.isDisable(role.getStatus())) {
+ throw exception(MEMBER_WXCP_ROLE_NOT_AVAILABLE);
+ }
+ boolean hasMobile = StrUtil.isNotBlank(mobile);
+ String username = hasMobile ? mobile : "wx" + UUID.randomUUID().toString().replace("-", "").substring(0, 16);
+ String password = hasMobile ? mobile : UUID.randomUUID().toString().replace("-", "").substring(0, 16);
+ String nickname = StrUtil.maxLength(application.getApplicantName(), 30);
try {
return adminUserApi.createUser(new AdminUserCreateReqDTO()
@@ -159,8 +265,9 @@
.setNickname(nickname)
.setDeptId(MEMBER_DEPT_ID)
.setPostIds(Collections.emptySet())
- .setMobile(mobile)
- .setPassword(mobile) // 榛樿瀵嗙爜涓烘墜鏈哄彿
+ .setRoleIds(Collections.singleton(role.getId()))
+ .setMobile(hasMobile ? mobile : null)
+ .setPassword(password)
.setEmail(application.getContactEmail())
.setRemark("鐢卞叆浼氱敵璇疯嚜鍔ㄥ垱寤猴細" + application.getNo()));
} catch (Exception e) {
@@ -176,6 +283,13 @@
/**
* 鏍￠獙浼氬憳绛夌骇涓庣被鍨嬪尮閰嶏細鍗曚綅浼氬憳锛坱ype=2锛変笉鍙�変釜浜轰笓鏈夌瓑绾с��5-鐞嗕簨闀裤��
*/
+ /** 宸茬即绾充細璐规椂蹇呴』濉啓缂磋垂骞村害 */
+ private void validateFeePaid(UmsMemberSaveReqVO reqVO) {
+ if (Boolean.TRUE.equals(reqVO.getFeePaid()) && reqVO.getFeeYear() == null) {
+ throw exception(MEMBER_FEE_YEAR_REQUIRED);
+ }
+ }
+
private void validateMemberGrade(Integer memberType, String memberGrade) {
if (memberType == null || StrUtil.isBlank(memberGrade)) {
return;
@@ -193,4 +307,19 @@
return member;
}
-}
\ No newline at end of file
+ /** 浼氬憳鐘舵�佷腑鏂囧悕锛�1-姝ｅ父 0-鏆傚仠锛堢敤浜庡綊妗ｅけ璐ユ彁绀猴級 */
+ private String memberStatusName(Integer status) {
+ if (status == null) {
+ return "鏈煡";
+ }
+ return MEMBER_STATUS_NORMAL.equals(status) ? "姝ｅ父" : "鏆傚仠";
+ }
+
+ /** 鏌ヨ鏉ユ簮鍗曟嵁宸茬敓鎴愮殑妗ｆ缂栧彿锛堟湭褰掓。鏃惰繑鍥� null锛� */
+ private String archiveNo(Long memberId) {
+ ArchiveDocumentRespDTO archive = archiveDocumentApi
+ .getBySource(ARCHIVE_SOURCE_TYPE_MEMBER, memberId).getCheckedData();
+ return archive != null ? archive.getNo() : null;
+ }
+
+}
--
Gitblit v1.9.3