From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 6b78e9b..cfb944d 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
@@ -7,14 +7,12 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import com.ruoyi.system.api.factory.MemberFallbackFactory;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
-
-import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,7 +31,7 @@
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/member/list-by-ids")
- R<List<Member>> getMemberListByIds(@RequestParam("memberIdList") Set<Long> memberIdList,
+ R<List<Member>> getMemberListByIds(@RequestParam("memberIdList") Collection<Long> memberIdList,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/forepart/member/miniLogin")
@@ -43,6 +41,13 @@
R<?> addMemberPoints(@RequestBody MemberPointsDTO memberPointsDTO);
@PostMapping("/member/updMembeOne")
- R<?> updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO);
+ R<?> updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/member/list-by-condition")
+ R<List<Member>> getMemberListByCondition(@RequestBody MemberDTO memberDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/member/list-by-level")
+ R<List<Member>> getMemberListByLevel(@RequestBody List<String> memberLevelList,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1