From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 bc00f42..474951a 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;
@@ -44,10 +46,12 @@
import cn.lili.mybatis.util.PageUtil;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.MemberTagsEnum;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -111,6 +115,12 @@
@Autowired
private VideoAccountService videoAccountService;
+
+ @Autowired
+ private MemberTagService memberTagService;
+
+ @Autowired
+ private COSUtil cosUtil;
@Override
public Member findByUsername(String userName) {
@@ -250,13 +260,14 @@
authUser.setNickname(CommonUtil.getSpecialStr("鐢ㄦ埛"));
}
if (CharSequenceUtil.isEmpty(authUser.getAvatar())) {
- authUser.setAvatar("https://i.loli.net/2020/11/19/LyN6JF7zZRskdIe.png");
+ authUser.setAvatar("");
}
try {
// String username = UuidUtils.getUUID();
Member member = new Member(authUser.getUsername(), UuidUtils.getUUID(), authUser.getAvatar(), authUser.getNickname(),
authUser.getGender() != null ? Convert.toInt(authUser.getGender().getCode()) : 0, authUser.getPhone());
member.setPassword(DEFAULT_PASSWORD);
+ member.setUuId(authUser.getUuid());
// 鍙戦�佷細鍛樻敞鍐屼俊鎭�
registerHandler(member);
@@ -312,6 +323,7 @@
* @param member
*/
@Transactional
+ @Override
public void registerHandler(Member member) {
member.setId(SnowFlake.getIdStr());
//淇濆瓨浼氬憳
@@ -485,6 +497,7 @@
}
@Override
+ @Transactional
public Member updateMember(ManagerMemberEditDTO managerMemberEditDTO) {
//杩囨护浼氬憳鏄电О鏁忔劅璇�
if (CharSequenceUtil.isNotBlank(managerMemberEditDTO.getNickName())) {
@@ -499,20 +512,28 @@
//浼犻�掍慨鏀逛細鍛樹俊鎭�
BeanUtil.copyProperties(managerMemberEditDTO, member);
this.updateById(member);
+ if (managerMemberEditDTO.getTags() != null && !CollectionUtils.isEmpty(managerMemberEditDTO.getTags())) {
+ MemberTagForm memberTagForm = new MemberTagForm();
+ memberTagForm.setMemberId(member.getId());
+ memberTagForm.setTagIds(managerMemberEditDTO.getTags());
+ memberTagForm.setCreateType("MANAGER");
+ memberTagService.addMemberTag(memberTagForm);
+ }
return member;
}
+
@Override
- public Result resetPassword(String id){
- String password = "123456";
- Member member = this.getById(id);
- member.setPassword(new BCryptPasswordEncoder().encode(password));
- this.updateById(member);
- return Result.ok("閲嶇疆鎴愬姛");
+ public Result resetPassword(String id) {
+ String password = "123456";
+ Member member = this.getById(id);
+ member.setPassword(new BCryptPasswordEncoder().encode(password));
+ this.updateById(member);
+ return Result.ok("閲嶇疆鎴愬姛");
}
@Override
- public Member updateMemberPartProperties(String id,String password,String mobile) {
+ public Member updateMemberPartProperties(String id, String password, String mobile) {
//鏌ヨ浼氬憳淇℃伅
Member member = this.getById(id);
member.setMobile(mobile);
@@ -783,7 +804,11 @@
@Override
public MemberVO getMember(String id) {
- return new MemberVO(this.getById(id));
+ MemberVO member = baseMapper.getVoById(id);
+ if (Objects.nonNull(member)) {
+ member.setFace(cosUtil.getPreviewUrl(member.getFace()));
+ }
+ return member;
}
@Override
@@ -861,6 +886,13 @@
return result;
}
+ @Override
+ public Member findByUUID(String uuid) {
+ QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("uu_id", uuid);
+ return this.baseMapper.selectOne(queryWrapper);
+ }
+
/**
* 妫�娴嬩細鍛�
*
--
Gitblit v1.8.0