From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 20:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
index 3df8131..95e1160 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
@@ -1,16 +1,18 @@
package com.ruoyi.member.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
+import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
-import org.springframework.web.bind.annotation.RequestBody;
-
import java.util.List;
import java.util.Set;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -22,7 +24,7 @@
*/
public interface IMemberService extends IService<Member> {
- AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto);
+ AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception;
Member getMembeid(MemberDTO memberDTO);
@@ -33,4 +35,12 @@
List<Member> getMemberListByIds(Set<Long> memberIdList);
AppMiniLoginVO miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO);
+
+ /**
+ * 获取会员管理分页列表
+ *
+ * @param query 会员列表查询对象
+ * @return PageDTO<MgtMemberVO>
+ */
+ PageDTO<MgtMemberVO> getMemberPage(MgtMemberQuery query);
}
--
Gitblit v1.7.1