From 3b52375c2a251022e87b2e3deb21b9f5ae9832b3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 九月 2024 18:00:42 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 00799b8..b96a0d5 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,11 +3,15 @@
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;
+import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@@ -25,7 +29,7 @@
* @return
*/
@PostMapping("/wx/query/queryOrderInfo")
- R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId);
+ R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId);
/**
@@ -37,17 +41,15 @@
R<Map<String, Object>> orderPay(@RequestBody PaymentOrder paymentOrder);
- /**
- * 支付回调
- * @param request
- * @return
- */
- @PostMapping("/wx/pay/notify")
- R<Map<String, Object>> payNotify(HttpServletRequest request);
/**
- * 支付回调成功后的成功应答
+ * 关闭订单
+ * @param outTradeNo
*/
- @PostMapping("/wx/pay/ack")
- void ack();
+ @PostMapping("/wx/pay/close")
+ void close(String outTradeNo);
+
+ @ApiOperation("订单退款")
+ @PostMapping(value = "/wx/refundOrderR")
+ public R<String> refundOrderR(@RequestBody WxPaymentRefundModel model);
}
--
Gitblit v1.7.1