From a0c7de34c4539a73e1c08e4dee6609b791dd34c0 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期四, 01 十二月 2022 10:12:05 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
index 1bdab13..e97ce7a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
@@ -5,7 +5,9 @@
  */
 
 import com.hx.resultTool.Result;
+import com.hz.his.dto.sync.SyncOrderDto;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -20,6 +22,25 @@
      * @param orderId
      * @return
      */
-    @PostMapping(value = "/sync/order/getOrderById")
+    @GetMapping(value = "/sync/order/getOrderById")
     Result getOrderById(@RequestParam("orderId") String orderId);
+
+   /**
+     * 淇敼棰嗗仴璁㈠崟涓轰綔搴熻鍗�
+     * 娉ㄦ剰涓嶈闅忔剰璋冪敤锛岄渶瑕佺敤鍒板厛鍜屽悓姝ヤ腑蹇冨晢閲�
+     * @param syncOrderDto
+     * @return
+     */
+    @PostMapping(value = "/sync/order/cancelOrder")
+    Result cancelOrder(SyncOrderDto syncOrderDto);
+
+    /**
+     * 淇敼棰嗗缓璁㈠崟涓洪��娆剧姸鎬�
+     * 娉ㄦ剰涓嶈闅忔剰璋冪敤锛岄渶瑕佺敤鍒板厛鍜屽悓姝ヤ腑蹇冨晢閲�
+     * @param syncOrderDto
+     * @return
+     */
+    @PostMapping(value = "/sync/order/refundOrder")
+    Result refundOrder(SyncOrderDto syncOrderDto);
+
 }

--
Gitblit v1.8.0