From ee310ce2ae4b954219c6949c31c6d11d8610747c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 18:52:47 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test
---
phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java | 18 +++++++++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java b/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java
index 4f35272..444fa9e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java
@@ -19,6 +19,8 @@
private String name;
/**鏄惁鏅�氫細鍛�*/
private Integer isOrdinary;
+ /**鏄惁VIP*/
+ private Integer isVip;
/**寮�濮嬪尯闂�*/
private BigDecimal startExperience;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
index 8d02990..2b4d6a9 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
@@ -14,6 +14,19 @@
@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "memberLevel")
public interface SMemberLevelService {
+
+ /**
+ * 鏌ヨ浼氬憳绛夌骇鍒楄〃锛堢畝绾︽暟鎹級
+ */
+ @PostMapping(value = "/member/simple-list")
+ Result getMemberSimpleList(@RequestBody MemberDto memberDto);
+
+ /**
+ * 鏌ヨ浼氬憳绛夌骇鍒楄〃
+ */
+ @PostMapping(value = "/member/level/list")
+ Result getMemberLevelList(@RequestBody MemberDto memberDto);
+
/**
* 鑾峰彇浼氬憳绛夌骇璇︽儏
* @param memberLevelId 浼氬憳绛夌骇鏍囪瘑
@@ -22,11 +35,6 @@
@PostMapping(value = "/member/level/detail")
Result getMemberLevelDetail(@RequestParam("memberLevelId") String memberLevelId);
- /**
- * 鏌ヨ浼氬憳绛夌骇鍒楄〃
- */
- @PostMapping(value = "/member/level/list")
- Result getMemberLevelList(@RequestBody(required = false) MemberDto memberDto);
/**
* 鏍规嵁浼氬憳鍚嶇О鏌ヨ浼氬憳绛夌骇璇︽儏
--
Gitblit v1.8.0