From b4707c89691166e9febc0e3321c0ecea6d5c30f3 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期日, 25 六月 2023 11:38:52 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java              |    3 +++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java |   30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 270b09c..a53e519 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -68,4 +68,7 @@
     @PostMapping(value = "/emp/role/info/list")
     Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);
 
+    @PostMapping(value = "/emp/check/doctor")
+    Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);
+
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
new file mode 100644
index 0000000..4761502
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.refund;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.order.refund.card.RefundUserCardVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**鐢ㄦ埛鍗¢」閫�娆緁eign
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ * @author CJH
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "card-refund")
+public interface SCardRefundService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍗¢」鏉$洰鍙��娆鹃噾棰�
+     * data 瀹炰綋杞寲鐢紙RefundUserCardVo锛�
+     */
+    @PostMapping(value = "/card/refund/get/amount")
+    Result getRefundAmount(@RequestBody RefundUserCardVo refundUserCardVo);
+
+    /**
+     * 寮�鏀惧钩鍙�-纭鎻愪氦閫�娆�
+     * data 鏃犲疄浣撹浆鍖栫敤
+     */
+    @PostMapping(value = "/confirm")
+    Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);
+
+}
\ No newline at end of file

--
Gitblit v1.8.0