From 05e49980cd556d24239e00d028dc5efa25e0de14 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 11 六月 2025 11:50:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 ddcd129..bc00f42 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
@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.base.Result;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.aop.annotation.DemoSite;
@@ -49,7 +50,6 @@
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;
@@ -501,6 +501,25 @@
this.updateById(member);
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("閲嶇疆鎴愬姛");
+ }
+
+
+ @Override
+ public Member updateMemberPartProperties(String id,String password,String mobile) {
+ //鏌ヨ浼氬憳淇℃伅
+ Member member = this.getById(id);
+ member.setMobile(mobile);
+ member.setUsername(mobile);
+ this.updateById(member);
+ return member;
+ }
@Override
public IPage<MemberVO> getMemberPage(MemberSearchVO memberSearchVO, PageVO page) {
--
Gitblit v1.8.0