From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
index 9e4e70e..523328a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -3,17 +3,15 @@
 import com.hx.resultTool.Result;
 import com.hz.his.dto.marketing.OrderCancelDto;
 import com.hz.his.dto.marketing.OrderDiscountDto;
+import com.hz.his.dto.marketing.OrderPartRefundDto;
 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.RequestParam;
-
-import java.math.BigDecimal;
 
 /**
  * 钀ラ攢鍔╂墜
  */
-@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m_order")
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-order")
 public interface MOrderService {
 
     /**
@@ -30,4 +28,10 @@
     Result applyOrderCancel(@RequestBody OrderCancelDto orderCancelDto);
 
 
+    /**
+     * 璁㈠崟閮ㄥ垎閫�娆剧敵璇�
+     */
+    @PostMapping(value = "/order/apply/part/refund")
+    Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+
 }

--
Gitblit v1.8.0