From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 34c9290..3553f56 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
@@ -3,9 +3,12 @@
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.MerMemberTagEditDto;
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.poji.member.Member;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
@@ -80,4 +83,30 @@
* @return
*/
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);
}
--
Gitblit v1.7.1