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 | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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 aa99b99..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,6 +1,7 @@
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;
@@ -40,6 +41,13 @@
* 浼氬憳绯荤粺璐﹀彿榛樿閮ㄩ棬 ID锛坰ystem_dept 涓�屽浼氫細鍛樸�嶏級
*/
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";
@@ -117,6 +125,7 @@
// 浼氬憳绛夌骇涓庣被鍨嬪尮閰嶆牎楠�
validateMemberGrade(createReqVO.getMemberType(), createReqVO.getMemberGrade());
+ validateFeePaid(createReqVO);
UmsMemberDO member = BeanUtils.toBean(createReqVO, UmsMemberDO.class, in -> in
.setNo(no)
@@ -135,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());
@@ -213,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())
@@ -230,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;
--
Gitblit v1.9.3