From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 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 469bfba..3cfd13a 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
@@ -22,6 +22,8 @@
import cn.lili.modules.connect.entity.Connect;
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.service.VideoAccountService;
import cn.lili.modules.member.aop.annotation.PointLogPoint;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.*;
@@ -47,6 +49,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -105,6 +108,9 @@
*/
@Autowired
private Cache cache;
+
+ @Autowired
+ private VideoAccountService videoAccountService;
@Override
public Member findByUsername(String userName) {
@@ -310,6 +316,11 @@
member.setId(SnowFlake.getIdStr());
//淇濆瓨浼氬憳
this.save(member);
+ // 鍚屾椂鏂板涓�涓棰戣处鍙�
+ VideoAccount videoAccount = new VideoAccount();
+ videoAccount.setUserId(member.getId());
+ videoAccountService.save(videoAccount);
+
UserContext.settingInviter(member.getId(), cache);
// 鍙戦�佷細鍛樻敞鍐屼俊鎭�
applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("new member register", rocketmqCustomProperties.getMemberTopic(),
@@ -487,6 +498,21 @@
Member member = this.getById(managerMemberEditDTO.getId());
//浼犻�掍慨鏀逛細鍛樹俊鎭�
BeanUtil.copyProperties(managerMemberEditDTO, member);
+ this.updateById(member);
+ return member;
+ }
+
+
+ @Override
+ public Member updateMemberPartProperties(String id,String password,String mobile) {
+ //鏌ヨ浼氬憳淇℃伅
+ Member member = this.getById(id);
+ //濡傛灉瀵嗙爜涓嶄负绌哄垯鍔犲瘑瀵嗙爜
+ if (CharSequenceUtil.isNotBlank(password)) {
+ member.setPassword(new BCryptPasswordEncoder().encode(password));
+ }
+ member.setMobile(mobile);
+ member.setUsername(mobile);
this.updateById(member);
return member;
}
@@ -844,4 +870,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0