From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/member/service/MemberService.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index 614446c..34e1bf0 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -1,10 +1,13 @@
package cn.lili.modules.member.service;
+import cn.lili.base.Result;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.security.token.Token;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
+import cn.lili.modules.lmk.domain.form.MemberBindStoreForm;
+import cn.lili.modules.lmk.domain.form.MemberNickNameForm;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
import cn.lili.modules.member.entity.dto.MemberAddDTO;
@@ -26,6 +29,15 @@
* @since 2020-02-25 14:10:16
*/
public interface MemberService extends IService<Member> {
+
+ Result updateMemberNickName(MemberNickNameForm form);
+ /**
+ * 閲嶇疆瀵嗙爜 榛樿鍊�123456
+ * @param id 鐢ㄦ埛id
+ * @return
+ */
+ Result resetPassword(String id);
+
/**
* 鐢ㄦ埛鏉冮檺绠＄悊淇敼鐢ㄦ埛
* @param id 浼氬憳id
@@ -212,7 +224,7 @@
* @param authUser 鑱斿悎鐧诲綍鐢ㄦ埛
* @return Token
*/
- Member autoRegister(ConnectAuthUser authUser);
+ Member autoRegister(ConnectAuthUser authUser,Boolean encryptTwice);
/**
* 鍒锋柊token
@@ -229,6 +241,10 @@
* @return Token
*/
Token refreshStoreToken(String refreshToken);
+
+ IPage<MemberVO> getMemberPageAndTag(MemberSearchVO memberSearchVO, PageVO page);
+
+ void exportMember(MemberSearchVO memberSearchVO);
/**
* 浼氬憳绉垎鍙樺姩
@@ -328,4 +344,10 @@
boolean appSConfirm(String token, Integer code);
QRLoginResultVo loginWithSession(String token);
-}
\ No newline at end of file
+
+ Member findByUUID(String uuid);
+
+ void registerHandler(Member user);
+
+ Result bindMemberAndStore(MemberBindStoreForm form);
+}
--
Gitblit v1.8.0