From 5d34bdd3c426bb2ca5f6627424ae67984f745603 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 21 十月 2026 18:28:59 +0800
Subject: [PATCH] feat: 新增资产/用车/采购模块，完善课题、会员、财务与企微功能
---
yudao-module-ums/src/main/java/cn/iocoder/yudao/module/ums/service/member/UmsMemberServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 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..5b5f9b4 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,9 +1,14 @@
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.ums.controller.admin.member.vo.UmsMemberPageReqVO;
@@ -20,7 +25,9 @@
import java.time.LocalDate;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
+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,7 +42,26 @@
*/
private static final Long MEMBER_DEPT_ID = 129L;
+ /**
+ * 鏅�氫細鍛樿鑹� ID锛坰ystem_role銆屾櫘閫氫細鍛樸�嶏級
+ *
+ * <p>璇ヨ鑹插彧鍒嗛厤銆屾垜鐨勮祫鏂欍�嶈彍鍗曪紝涓嶅寘鍚。妗堢鐞嗙瓑鍚庡彴鑿滃崟锛岀敤浜庡疄鐜版潈闄愰殧绂汇��
+ */
+ private static final Long MEMBER_ROLE_ID = 9100L;
+
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;
@@ -48,6 +74,9 @@
@Resource
private StorageAttachmentApi storageAttachmentApi;
+
+ @Resource
+ private ArchiveDocumentApi archiveDocumentApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -96,6 +125,7 @@
// 浼氬憳绛夌骇涓庣被鍨嬪尮閰嶆牎楠�
validateMemberGrade(createReqVO.getMemberType(), createReqVO.getMemberGrade());
+ validateFeePaid(createReqVO);
UmsMemberDO member = BeanUtils.toBean(createReqVO, UmsMemberDO.class, in -> in
.setNo(no)
@@ -114,9 +144,21 @@
public void updateMember(UmsMemberSaveReqVO updateReqVO) {
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 (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,6 +187,39 @@
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) {
@@ -159,6 +234,7 @@
.setNickname(nickname)
.setDeptId(MEMBER_DEPT_ID)
.setPostIds(Collections.emptySet())
+ .setRoleIds(Collections.singleton(MEMBER_ROLE_ID))
.setMobile(mobile)
.setPassword(mobile) // 榛樿瀵嗙爜涓烘墜鏈哄彿
.setEmail(application.getContactEmail())
@@ -176,6 +252,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 +276,19 @@
return member;
}
+ /** 浼氬憳鐘舵�佷腑鏂囧悕锛�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;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3