From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 19 +++++++++++++++----
1 files changed, 15 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..02c2ae7 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,16 @@
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 com.hz.his.dto.marketing.OrderPayMarketingDto;
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 +29,16 @@
Result applyOrderCancel(@RequestBody OrderCancelDto orderCancelDto);
+ /**
+ * 璁㈠崟閮ㄥ垎閫�娆剧敵璇�
+ */
+ @PostMapping(value = "/order/apply/part/refund")
+ Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+
+ /**
+ * 璁㈠崟鏀粯鐢宠
+ */
+ @PostMapping(value = "/order/apply/order/pay")
+ Result orderPay(@RequestBody OrderPayMarketingDto orderPayMarketingDto);
+
}
--
Gitblit v1.8.0