From 9a68e48e77e752ab4dbace7612a95b8d9187dcbc Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期四, 01 九月 2022 16:23:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 28 +++++++++++++++++++++++----- 1 files changed, 23 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..e0e353f 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,18 @@ 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; + +import javax.servlet.http.HttpServletRequest; /** * 杩欓噷杩欎釜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 +45,22 @@ @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 = "/order/add") + Result orderAdd(@RequestBody OrderPHisDto dto); + + /** + * 寮�鏀惧钩鍙�-缁撹处 + */ + @PostMapping(value = "/order/pay") + Result orderPay(@RequestBody PayDto dto); } \ No newline at end of file -- Gitblit v1.8.0