From 7987fd29be9bc08a36b949aa18b3703fb91759a5 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 31 八月 2022 14:54:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index 89daf33..5f4993b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -1,18 +1,16 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.order.OrderCreateDto;
-import com.hz.his.dto.order.OrderPayDto;
-import com.hz.his.dto.order.OrderRefundDto;
-import com.hz.his.dto.order.OrdersTotalDto;
+import com.hz.his.dto.order.*;
 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;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platfrom-service",path = "/phip",contextId = "phip-order")
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-order")
 public interface SPhipOrderService {
 
     /**
@@ -45,4 +43,15 @@
     @PostMapping(value = "/newSync/order/cancel")
     Result cancelOrder(@RequestBody OrderRefundDto params);
 
+    /**
+     * 寮�鏀惧钩鍙�-鍚屾涓績蹇冭烦閫�娆炬祦绋�
+     */
+    @PostMapping(value = "/refund/syn/refund")
+    Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
+    /**
+     * 寮�鏀惧钩鍙�-寮�鍗曞苟涓旂粨璐︽帴鍙�
+     */
+    @PostMapping(value = "/create/pay/order")
+    Result createPayOrder(@RequestBody OrderPHisDto dto);
 }
\ No newline at end of file

--
Gitblit v1.8.0