From d6e09bae199e8980f97dd4cdd2000ab6c2b7f06b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 22 五月 2026 10:10:51 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java
index 496217c..fc22b2f 100644
--- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java
@@ -3,6 +3,8 @@
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.QueryRefundReq;
+import com.ruoyi.payment.api.model.QueryRefundResp;
import com.ruoyi.payment.api.model.RefundReq;
import com.ruoyi.payment.api.model.RefundResp;
import com.ruoyi.payment.api.vo.AliPaymentReq;
@@ -11,6 +13,7 @@
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;
/**
* @author zhibing.pu
@@ -26,7 +29,7 @@
* @return
*/
@PostMapping("/ali/payment")
- R<AliPaymentResp> payment(AliPaymentReq req);
+ R<AliPaymentResp> payment(@RequestBody AliPaymentReq req);
/**
@@ -35,17 +38,26 @@
* @return
*/
@PostMapping("/ali/query")
- R<AliQueryOrder> query(String outTradeNo);
+ R<AliQueryOrder> query(@RequestParam("outTradeNo") String outTradeNo);
/**
* 关闭订单
* @param outTradeNo
*/
@PostMapping("/ali/close")
- void close(String outTradeNo);
+ void close(@RequestParam("outTradeNo") String outTradeNo);
/**
* 后台退款 远程调用
*/
@PostMapping("/ali/refund")
public R<RefundResp> refund(@RequestBody RefundReq dto);
+
+
+ /**
+ * 退款查询
+ * @param dto
+ * @return
+ */
+ @PostMapping("/ali/queryRefund")
+ R<QueryRefundResp> queryRefund(@RequestBody QueryRefundReq dto);
}
--
Gitblit v1.7.1