From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 18 三月 2025 11:17:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/MemberService.java | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/MemberService.java b/server/services/src/main/java/com/doumee/service/business/MemberService.java index 558f9ce..bc36b2a 100644 --- a/server/services/src/main/java/com/doumee/service/business/MemberService.java +++ b/server/services/src/main/java/com/doumee/service/business/MemberService.java @@ -4,6 +4,7 @@ import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.Member; import com.doumee.dao.business.web.request.RegisterRequest; +import com.doumee.dao.business.web.request.WxPhoneRequest; import com.doumee.dao.business.web.response.AccountResponse; import com.doumee.dao.business.web.response.UserResponse; @@ -18,11 +19,19 @@ /** * 鍒涘缓 - * + * * @param member 瀹炰綋瀵硅薄 * @return String */ String create(Member member); + + /** + * 鍒涘缓 + * + * @param member 瀹炰綋瀵硅薄 + * @return String + */ + String createManageMember(Member member); /** * 涓婚敭鍒犻櫎 @@ -51,6 +60,14 @@ * @param member 瀹炰綋瀵硅薄 */ void updateById(Member member); + + + /** + * 涓婚敭鏇存柊鍗′俊鎭� + * + * @param member 瀹炰綋瀵硅薄 + */ + void update(Member member); /** * 鎵归噺涓婚敭鏇存柊 @@ -82,7 +99,7 @@ * @return List<Member> */ List<Member> findList(Member member); - + /** * 鍒嗛〉鏌ヨ * @@ -91,6 +108,14 @@ */ PageData<Member> findPage(PageWrap<Member> pageWrap); + + /** + * 鍒嗛〉鏌ヨ鍗′俊鎭� + * + * @param pageWrap 鍒嗛〉瀵硅薄 + * @return PageData<Member> + */ + PageData<Member> findManagerMemberPage(PageWrap<Member> pageWrap); /** * 鏉′欢缁熻 * @@ -104,11 +129,18 @@ void wxEmpower(String code, String memberId); /** - * 鎷夊彇鐧诲綍 + * 鎺堟潈鐧诲綍 * @param code - * @param userId */ AccountResponse wxLogin(String code); + + /** + * 瑙f瀽鎵嬫満鍙� + * @param wxPhoneRequest + * @return + */ + AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest); + UserResponse getUserInfo(String memberId); } -- Gitblit v1.9.3