From 6011b014ae65b7a1bea456c02af4e2cd3596d8a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 14:30:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/H5PayUtil.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/H5PayUtil.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/H5PayUtil.java
index c68bc4e..b370613 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/H5PayUtil.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/H5PayUtil.java
@@ -146,7 +146,7 @@
//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
//boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
Map<String, String> map = new HashMap<>();
- System.err.println("返回码"+params);
+ System.err.println("H5返回码"+params);
if (params.get("trade_status").equals("TRADE_SUCCESS")){
String out_trade_no = params.get("out_trade_no");
String subject = params.get("subject");
@@ -158,7 +158,6 @@
map.put("total_amount", total_amount);
map.put("trade_no", trade_no);//支付宝交易号
map.put("passback_params", passback_params);//回传参数
- System.err.println("回调map");
return map;
}else{
return null;
@@ -200,11 +199,12 @@
* 支付宝退款
*
* @param trade_no 支付宝交易号
+ * @param outRequestNo 退款业务流水号
* @param refund_amount 退款金额
* @return
* @throws AlipayApiException
*/
- public Map<String, String> aliRefund(String trade_no, String refund_amount) {
+ public Map<String, String> aliRefund(String trade_no,String outRequestNo, String refund_amount) {
try {
// 初始化SDK
AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
@@ -213,6 +213,7 @@
// 设置订单支付时传入的商户订单号
model.setTradeNo(trade_no);
model.setRefundAmount(refund_amount);
+ model.setOutRequestNo(outRequestNo);
model.setRefundReason("充电退款");
request.setBizModel(model);
AlipayTradeRefundResponse response = alipayClient.execute(request);
--
Gitblit v1.7.1