From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 3 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 d770f30..eaa6253 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
@@ -4,9 +4,13 @@
 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.dto.MgtMemberPageDto;
 import com.ruoyi.member.domain.vo.MerCashMemberPageVo;
 import com.ruoyi.member.domain.vo.MerMemberPageVo;
+import com.ruoyi.member.domain.vo.MgtMemberPageVo;
+import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
 import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -28,25 +32,86 @@
      * @version 1.0
      */
     Member selectMemberByUserId(Long userId);
+
+
     /**
+     * @description: TODO
+     * @author jqs34
+     * @date 2023/4/30 12:41
+     * @version 1.0
+     */
+    Member selectMemberByMobile(String mobile);
+
+    /**
+     * 通过openid获取会员
      *
      * @param miniOpenid
      * @return
      */
-    Member getOneByMiniOpenid(@Param("miniOpenid")String miniOpenid);
+    Member getOneByMiniOpenid(@Param("miniOpenid") String miniOpenid);
 
     /**
+     * 商户获取绑定会员
      *
      * @param page
      * @return
      */
-    List<MerMemberPageVo> pageMerMember(Page page,@Param("param")MerMemberPageDto merMemberPageDto);
+    List<MerMemberPageVo> pageMerMember(Page page, @Param("param") MerMemberPageDto merMemberPageDto);
 
     /**
      * 分页获取收银用户列表
+     *
      * @param page
      * @param merCashMemberPageDto
      * @return
      */
-    List<MerCashMemberPageVo> pageMerCashMember(Page page, MerCashMemberPageDto merCashMemberPageDto);
+    List<MerCashMemberPageVo> pageMerCashMember(Page page, @Param("param") MerCashMemberPageDto merCashMemberPageDto);
+
+
+    /**
+     * 平台分页获取会员列表
+     *
+     * @param page
+     * @param merMemberPageDto
+     * @return
+     */
+    List<MgtMemberPageVo> pageMgtMember(Page page, @Param("param") MgtMemberPageDto merMemberPageDto);
+
+    /**
+     * @description  删除标签
+     * @author  jqs
+     * @date    2023/6/8 15:18
+     * @param memberTag
+     * @return  void
+     */
+    void deleteMemberTag(@Param("memberTag")String memberTag);
+
+    /**
+     * @description  通过发送类型获取userId
+     * @author  jqs
+     * @date    2023/6/13 17:53
+     * @param sendType
+     * @return  List<Long>
+     */
+    List<Long> listIdBySendType(@Param("sendType")Integer sendType);
+
+    /**
+     * @description  通过ids获取用户简易返回
+     * @author  jqs
+     * @date    2023/6/16 11:06
+     * @param userIds
+     * @return  List<MgtSimpleMemberVo>
+     */
+    List<MgtSimpleMemberVo> listSimpleVoByIds(@Param("userIds")String userIds);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/6/16 12:42
+     * @param mgtUserIdByKeywordDto
+     * @return  MgtUserIdByKeywordVo
+     */
+    List<Long> getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
 }
+
+

--
Gitblit v1.7.1