Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-04 0bf618ca34814ee535c5d39387dc63532b4e726a

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java

@@ -1,13 +1,18 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.vo.AppNearbyShopVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.member.domain.dto.MerMemberPageDto;
import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.member.domain.vo.AppUserInfoVo;
import com.ruoyi.member.domain.vo.MerMemberPageVo;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.member.domain.dto.AppNearbyShopDto;
import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
@@ -33,6 +38,7 @@
     */
    AppMiniLoginVo getMemberByCode(AppMiniLoginDto appMiniLoginDto);


    /**
     * 获取授权信息
     * @param appUserAuthorizeDto
@@ -40,5 +46,23 @@
     */
    AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto);

    /**
     * 获取用户信息
     * @param userId
     * @return
     */
    AppUserInfoVo getAppUserInfo(Long userId);

    /**
     * 修改用户信息
     * @param appEditUserDto
     */
    void editAppUserInfo(AppEditUserDto appEditUserDto);

    /**
     * 分页获取会员信息
     * @param merMemberPageDto
     * @return
     */
    List<MerMemberPageVo> pageMerMember(Page page, MerMemberPageDto merMemberPageDto);
}