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 | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 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 5b5f9b4..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
@@ -11,10 +11,15 @@
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;
@@ -27,6 +32,7 @@
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;
@@ -43,11 +49,9 @@
private static final Long MEMBER_DEPT_ID = 129L;
/**
- * 鏅�氫細鍛樿鑹� ID锛坰ystem_role銆屾櫘閫氫細鍛樸�嶏級
- *
- * <p>璇ヨ鑹插彧鍒嗛厤銆屾垜鐨勮祫鏂欍�嶈彍鍗曪紝涓嶅寘鍚。妗堢鐞嗙瓑鍚庡彴鑿滃崟锛岀敤浜庡疄鐜版潈闄愰殧绂汇��
+ * 浼佷笟寰俊鎵爜鐢ㄦ埛瑙掕壊缂栫爜锛涙寜缂栫爜鏌ヨ锛岄伩鍏嶄笉鍚岀幆澧冭鑹茬紪鍙蜂笉涓�鑷淬��
*/
- private static final Long MEMBER_ROLE_ID = 9100L;
+ private static final String MEMBER_ROLE_CODE = "wxcp_user";
public static final String MEMBER_RECORD_TYPE = "ums_member";
@@ -65,6 +69,12 @@
@Resource
private UmsMemberMapper memberMapper;
+ @Resource
+ private UmsApplicationMapper applicationMapper;
+ @Resource
+ private SocialUserService socialUserService;
+ @Resource
+ private RoleService roleService;
@Resource
private UmsNoRedisDAO noRedisDAO;
@@ -81,6 +91,8 @@
@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) {
@@ -89,6 +101,9 @@
// 2. 鍒涘缓绯荤粺鐢ㄦ埛璐﹀彿
Long userId = createSystemUser(application);
+ if (StrUtil.isNotBlank(application.getWxcpOpenid())) {
+ socialUserService.bindApprovedWxcpUser(application.getWxcpOpenid(), userId);
+ }
// 3. 鍒涘缓浼氬憳璁板綍
UmsMemberDO member = UmsMemberDO.builder()
@@ -97,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())
@@ -142,7 +159,7 @@
@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);
@@ -154,6 +171,10 @@
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())
@@ -224,9 +245,19 @@
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()
@@ -234,9 +265,9 @@
.setNickname(nickname)
.setDeptId(MEMBER_DEPT_ID)
.setPostIds(Collections.emptySet())
- .setRoleIds(Collections.singleton(MEMBER_ROLE_ID))
- .setMobile(mobile)
- .setPassword(mobile) // 榛樿瀵嗙爜涓烘墜鏈哄彿
+ .setRoleIds(Collections.singleton(role.getId()))
+ .setMobile(hasMobile ? mobile : null)
+ .setPassword(password)
.setEmail(application.getContactEmail())
.setRemark("鐢卞叆浼氱敵璇疯嚜鍔ㄥ垱寤猴細" + application.getNo()));
} catch (Exception e) {
@@ -291,4 +322,4 @@
return archive != null ? archive.getNo() : null;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3