From 2f1988b9b3047e64d1a7b85fbaf8518d16eb88ec Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 11:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 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 95e1160..11fb930 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
@@ -2,16 +2,20 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.member.controller.management.dto.MgtMemberPointsQuery;
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
+import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
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 com.ruoyi.system.api.domain.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MobileDTO;
+import com.ruoyi.system.api.domain.dto.*;
+
import java.util.List;
import java.util.Set;
+
import org.springframework.web.bind.annotation.RequestBody;
/**
@@ -34,7 +38,8 @@
List<Member> getMemberListByIds(Set<Long> memberIdList);
- AppMiniLoginVO miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO);
+
+ void mobile(@RequestBody MobileDTO mobileDTO);
/**
* 获取会员管理分页列表
@@ -43,4 +48,22 @@
* @return PageDTO<MgtMemberVO>
*/
PageDTO<MgtMemberVO> getMemberPage(MgtMemberQuery query);
+
+ /**
+ * 获取用户详情
+ *
+ * @param id 会员id
+ * @return MgtMemberVO
+ */
+ MgtMemberVO getMemberById(Long id);
+
+ /**
+ * 获取积分明细分页列表
+ *
+ * @param query 会员积分明细查询对象
+ * @return PageDTO<MgtMemberPointsVO>
+ */
+ PageDTO<MgtMemberPointsVO> getMemberPoints(MgtMemberPointsQuery query);
+
+ void updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO);
}
--
Gitblit v1.7.1