From ca825fdfe67223b2eb8a3f9c14b4e60e2339efc6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 九月 2024 11:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java
index 7c8f21f..8f6e6c2 100644
--- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java
@@ -3,8 +3,11 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.api.factory.WxPaymentFallbackFactory;
+import com.ruoyi.payment.api.model.WxPaymentRefundModel;
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.api.vo.PaymentOrder;
+import com.ruoyi.payment.api.vo.WxRefundNotifyResp;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +29,7 @@
* @return
*/
@PostMapping("/wx/query/queryOrderInfo")
- R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId);
+ R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId);
/**
@@ -59,4 +62,14 @@
*/
@PostMapping("/wx/pay/close")
void close(String outTradeNo);
+
+ @ApiOperation("订单退款")
+ @PostMapping(value = "/wx/refundOrderR")
+ public R<String> refundOrderR(@RequestBody WxPaymentRefundModel model);
+
+
+
+ @ApiOperation("订单退款回调")
+ @PostMapping(value = "/wx/refund/notify")
+ R<WxRefundNotifyResp> refundNotify(HttpServletRequest request);
}
--
Gitblit v1.7.1