From dc249113553d081aaa26d4d1f3718b5514363131 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 02 七月 2025 23:23:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 489d7ea..66493cb 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -24,6 +24,8 @@
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
import cn.lili.modules.connect.service.ConnectService;
import cn.lili.modules.lmk.domain.entity.VideoAccount;
+import cn.lili.modules.lmk.domain.form.MemberTagForm;
+import cn.lili.modules.lmk.service.MemberTagService;
import cn.lili.modules.lmk.service.VideoAccountService;
import cn.lili.modules.member.aop.annotation.PointLogPoint;
import cn.lili.modules.member.entity.dos.Member;
@@ -111,6 +113,9 @@
@Autowired
private VideoAccountService videoAccountService;
+
+ @Autowired
+ private MemberTagService memberTagService;
@Override
public Member findByUsername(String userName) {
@@ -487,6 +492,7 @@
}
@Override
+ @Transactional
public Member updateMember(ManagerMemberEditDTO managerMemberEditDTO) {
//杩囨护浼氬憳鏄电О鏁忔劅璇�
if (CharSequenceUtil.isNotBlank(managerMemberEditDTO.getNickName())) {
@@ -501,6 +507,13 @@
//浼犻�掍慨鏀逛細鍛樹俊鎭�
BeanUtil.copyProperties(managerMemberEditDTO, member);
this.updateById(member);
+ if (managerMemberEditDTO.getTags() != null) {
+ MemberTagForm memberTagForm = new MemberTagForm();
+ memberTagForm.setMemberId(member.getId());
+ memberTagForm.setTagIds(managerMemberEditDTO.getTags());
+ memberTagForm.setCreateType("MANAGER");
+ memberTagService.addMemberTag(memberTagForm);
+ }
return member;
}
@@ -786,7 +799,7 @@
@Override
public MemberVO getMember(String id) {
- return new MemberVO(this.getById(id));
+ return baseMapper.getVoById(id);
}
@Override
--
Gitblit v1.8.0