From 95163bc7f6714edcb14dd4369717b0a9d1ae15da Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 五月 2024 19:33:23 +0800
Subject: [PATCH] Merge branch 'dev-mitao'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
index 33fe3ab..2055777 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
@@ -1,21 +1,31 @@
 package com.ruoyi.system.api.feignClient;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.Member;
 import com.ruoyi.system.api.domain.MemberAddress;
 import com.ruoyi.system.api.factory.MemberFallbackFactory;
+import java.util.List;
+import java.util.Set;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(contextId = "memberClient", value = ServiceNameConstants.RUOYI_MEMBER, fallbackFactory = MemberFallbackFactory.class)
 public interface MemberClient {
 
     @PostMapping("/member-address/getMemberAddressOne")
-    R<MemberAddress> getMemberAddressOne(@RequestBody Long userId);
+    R<MemberAddress> getMemberAddressOne(@RequestBody Long userId,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/member/getMembeOne")
-    R<Member> getMembeOne(@RequestBody Long userId);
+    R<Member> getMembeOne(@RequestBody Long userId,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @PostMapping("/member/list-by-ids")
+    R<List<Member>> getMemberListByIds(@RequestParam("memberIdList") Set<Long> memberIdList,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

--
Gitblit v1.7.1