From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 54ba192..357bdc9 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,12 +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.RefundReq;
+import com.ruoyi.payment.api.model.RefundResp;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
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
@@ -24,7 +27,7 @@
* @return
*/
@PostMapping("/ali/payment")
- R<AliPaymentResp> payment(AliPaymentReq req);
+ R<AliPaymentResp> payment(@RequestBody AliPaymentReq req);
/**
@@ -33,13 +36,17 @@
* @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);
}
--
Gitblit v1.7.1