From 9658e5ca43e617c68c54d7dd7797f873e55311c3 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期三, 10 五月 2023 21:26:39 +0800 Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java index efabbc7..828da62 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java @@ -1,8 +1,15 @@ package com.ruoyi.member.mapper.member; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.member.domain.dto.MerCashMemberPageDto; +import com.ruoyi.member.domain.dto.MerMemberPageDto; +import com.ruoyi.member.domain.vo.MerCashMemberPageVo; +import com.ruoyi.member.domain.vo.MerMemberPageVo; import com.ruoyi.system.api.domain.poji.member.Member; import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * <p> @@ -27,4 +34,19 @@ * @return */ Member getOneByMiniOpenid(@Param("miniOpenid")String miniOpenid); + + /** + * + * @param page + * @return + */ + List<MerMemberPageVo> pageMerMember(Page page,@Param("param")MerMemberPageDto merMemberPageDto); + + /** + * 分页获取收银用户列表 + * @param page + * @param merCashMemberPageDto + * @return + */ + List<MerCashMemberPageVo> pageMerCashMember(Page page, @Param("param")MerCashMemberPageDto merCashMemberPageDto); } -- Gitblit v1.7.1