From cd31c1b504f19c0193d453b25d188256543198cb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 11 七月 2025 10:52:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/H5AliPayController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/H5AliPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/H5AliPayController.java
index ee5a5d7..7d61713 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/H5AliPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/H5AliPayController.java
@@ -79,7 +79,7 @@
*/
@PostMapping("/refund")
public R<RefundResp> refund(@RequestBody RefundReq dto){
- Map<String, String> map = h5PayUtil.aliRefund(dto.getOutTradeNo(), dto.getRefundAmount());
+ Map<String, String> map = h5PayUtil.aliRefund(dto.getOutTradeNo(),dto.getOutRequestNo(), dto.getRefundAmount());
RefundResp refundResp = new RefundResp();
refundResp.setCode(map.get("code"));
refundResp.setMsg(map.get("msg"));
@@ -94,7 +94,7 @@
public void chargingOrderALICallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> callback = h5PayUtil.alipayCallback(request);
- log.info("支付回调：{}", callback);
+ log.info("H5支付回调：{}", callback);
if(null != callback){
String out_trade_no = callback.get("out_trade_no");
String attach = callback.get("subject");
@@ -104,7 +104,7 @@
switch (substring){
case "CD":
chargingOrderClient.chargingOrderALIH5Callback(out_trade_no, transaction_id, attach);
- System.err.println("----充电支付回调");
+ System.err.println("----H5充电支付回调");
break;
}
PrintWriter writer = response.getWriter();
--
Gitblit v1.7.1