From 85d8efdb96a9b4900dbceef524a29690e13b7800 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 28 六月 2024 09:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index acfe975..f40dbe9 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1304,7 +1304,7 @@
@PostMapping("/base/aliPayOrderTaxi")
public void aliPayOrderTaxi(HttpServletRequest request, HttpServletResponse response){
try {
- Map<String, String> map = payMoneyUtil.alipayCallback(request);//icbcPayUtil.payCallback(request);
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String out_trade_no = map.get("out_trade_no");
String order_id = map.get("trade_no");
--
Gitblit v1.7.1