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/service/member/MemberService.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 139 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
index 2c75d14..771742c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -1,17 +1,16 @@
package com.ruoyi.member.service.member;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.member.domain.dto.MerCashMemberPageDto;
-import com.ruoyi.member.domain.dto.MerMemberPageDto;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
-import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo;
+import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
-import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
@@ -26,12 +25,13 @@
public interface MemberService extends IService<Member> {
/**
- * @description: TODO
+ * @description: 通过userId获取会员
* @author jqs34
* @date 2023/4/30 12:41
* @version 1.0
*/
Member getByUserId(Long userId);
+
/**
* 小程序登录
* @param appMiniLoginDto
@@ -42,10 +42,10 @@
/**
* 获取授权信息
- * @param appUserAuthorizeDto
+ * @param appUserRegisterDto
* @return
*/
- AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto);
+ AppMiniRegisterVo miniRegister(AppMiniRegisterDto appUserRegisterDto);
/**
* 获取用户信息
@@ -68,7 +68,7 @@
List<MerMemberPageVo> pageMerMember(Page page, MerMemberPageDto merMemberPageDto);
/**
- * @description: TODO
+ * @description: 商户获取会员信息
* @author jqs34
* @date 2023/5/4 23:55
* @version 1.0
@@ -76,7 +76,7 @@
MerMemberInfoVo getMerMemberInfo(Long userId);
/**
- * 分页获取收银用户列表
+ * 分页获取收银会员列表
* @param page
* @param merCashMemberPageDto
* @return
@@ -84,8 +84,134 @@
List<MerCashMemberPageVo> pageMerCashMember(Page page, MerCashMemberPageDto merCashMemberPageDto);
/**
- *
+ * 更新会员绑定商户
* @param appMemberBindingDto
*/
void updateMemberBinding(AppMemberBindingDto appMemberBindingDto);
+
+ /**
+ * 获取会员基础档案
+ * @param userId
+ * @return
+ */
+ MerMemberBasicFileVo getMerMemberBasicFile(Long userId);
+
+ /**
+ * 获取会员标签
+ * @param userId
+ * @return
+ */
+ List<MerMemberTagVo> getMerMemberTags(Long userId);
+
+ /**
+ * 编辑会员标签
+ * @param merMemberTagEditDto
+ */
+ void editMerMemberTags(MerMemberTagEditDto merMemberTagEditDto);
+
+ /**
+ * 添加会员
+ * @param merMemberAddDto
+ */
+ void addMerMember(MerMemberAddDto merMemberAddDto);
+
+ /**
+ * 编辑会员
+ * @param merMemberEditDto
+ */
+ void editMerMember(MerMemberEditDto merMemberEditDto);
+
+ /**
+ * 通过手机号获取
+ * @param mobile
+ * @return
+ */
+ Member getByMobile(String mobile);
+
+ /**
+ * 更新用户商品类型
+ * @param appMemberGoodsTypeDto
+ */
+ void updateMemberGoodsType(AppMemberGoodsTypeDto appMemberGoodsTypeDto);
+
+ /**
+ * 订单创建新用户
+ * @param member
+ */
+ void createNewMember(Member member);
+
+ /**
+ * 平台分页获取会员列表
+ * @param page
+ * @param merMemberPageDto
+ * @return
+ */
+ List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto);
+
+ /**
+ * 修改会员关联商户
+ * @param mgtMemberRelEditDto
+ */
+ void editMemberRelationShop(MgtMemberRelEditDto mgtMemberRelEditDto);
+
+ /**
+ * 删除会员关联商户
+ * @param mgtMemberRelDelDto
+ */
+ void deleteMemberRelationShop(MgtMemberRelDelDto mgtMemberRelDelDto);
+
+ /**
+ * 修改会员积分
+ * @param mgtMemberIntEditDto
+ */
+ void editMemberIntegral(MgtMemberIntEditDto mgtMemberIntEditDto);
+
+ /**
+ * 会员积分变动
+ * @param memberIntegralChangeDto
+ */
+ void memberIntegralChange(MemberIntegralChangeDto memberIntegralChangeDto);
+
+ /**
+ * 平台获取会员信息
+ * @param userId
+ * @return
+ */
+ MgtMemberGetVo getMgtMemberInfo(Long userId);
+
+ /**
+ * @description 删除标签
+ * @author jqs
+ * @date 2023/6/8 15:18
+ * @param memberTag
+ * @return void
+ */
+ void deleteMemberTag(String memberTag);
+
+ /**
+ * @description 通过发送类型获取userId
+ * @author jqs
+ * @date 2023/6/13 17:53
+ * @param sendType
+ * @return List<Long>
+ */
+ List<Long> listIdBySendType(Integer sendType);
+
+ /**
+ * @description 通过ids获取用户简易返回
+ * @author jqs
+ * @date 2023/6/16 11:06
+ * @param userIds
+ * @return List<MgtSimpleMemberVo>
+ */
+ List<MgtSimpleMemberVo> listSimpleVoByIds(String userIds);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/16 12:42
+ * @param mgtUserIdByKeywordDto
+ * @return MgtUserIdByKeywordVo
+ */
+ MgtUserIdByKeywordVo getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
}
--
Gitblit v1.7.1