From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 a09b432..dfa9730 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
@@ -6,6 +6,7 @@
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;
@@ -28,7 +29,7 @@
* @return
*/
@PostMapping("/wx/query/queryOrderInfo")
- R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId);
+ R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId);
/**
@@ -40,20 +41,6 @@
R<Map<String, Object>> orderPay(@RequestBody PaymentOrder paymentOrder);
- /**
- * 支付回调
- * @param request
- * @return
- */
- @PostMapping("/wx/pay/notify")
- R<Map<String, Object>> payNotify(HttpServletRequest request);
-
- /**
- * 支付回调成功后的成功应答
- */
- @PostMapping("/wx/pay/ack")
- void ack();
-
/**
* 关闭订单
@@ -64,5 +51,5 @@
@ApiOperation("订单退款")
@PostMapping(value = "/wx/refundOrderR")
- public R<String> refundOrderR(@RequestBody WxPaymentRefundModel model);
+ R<Map<String, Object>> refundOrderR(@RequestBody WxPaymentRefundModel model);
}
--
Gitblit v1.7.1