From a2710eae94f1303434adfcdc3e23c5efaba151c5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 19:03:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
index 8816fac..886a184 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
@@ -46,7 +46,6 @@
if(null != payment){
AliPaymentResp aliPaymentResp = new AliPaymentResp();
aliPaymentResp.setTradeNo(payment.getTradeNo());
- aliPaymentResp.setNotifyUrl(aliProperties.getNotifyUrl());
return R.ok(aliPaymentResp);
}
return R.ok();
@@ -95,8 +94,8 @@
@Resource
private ChargingOrderClient chargingOrderClient;
@ResponseBody
- @PostMapping(value = "/all")
- public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response) {
+ @PostMapping(value = "/callBack")
+ public void chargingOrderALICallback(AliQueryOrder aliQueryOrder, HttpServletResponse response) {
try {
String out_trade_no = aliQueryOrder.getOutTradeNo();
String transaction_id = aliQueryOrder.getTradeNo();
@@ -113,10 +112,14 @@
System.err.println("----收到会员回调");
break;
case "CD":
- chargingOrderClient.chargingOrderWXCallback(out_trade_no, transaction_id, attach);
+ chargingOrderClient.chargingOrderALICallback(out_trade_no, transaction_id, attach);
System.err.println("----充电支付回调");
break;
}
+ PrintWriter writer = response.getWriter();
+ writer.println("success");
+ writer.flush();
+ writer.close();
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1