From fc9cac864414b566e3516f6702b716e8ed00e9dc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 六月 2023 16:34:29 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 523328a..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
@@ -4,6 +4,7 @@
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;
@@ -34,4 +35,10 @@
@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