From c3e5e631dbb19f1fbdc4ceb99b775354c303a92a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 20:42:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index e6bb96d..f14e98f 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -28,6 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -90,6 +91,8 @@
@Autowired
private IOrderCancelService orderCancelService;
+ @Autowired
+ private PayMoneyUtil payMoneyUtil;
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
@@ -1247,33 +1250,37 @@
@PostMapping("/base/wxPayOrderTaxi")
public void wxPayOrderTaxi(HttpServletRequest request, HttpServletResponse response){
try {
- Map<String, String> map = icbcPayUtil.payCallback(request);
+ System.out.println("完成订单微信支付回调");
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ System.out.println("wx支付信息："+map);
+
+
if(null != map){
+ String order_id = map.get("transaction_id");
String out_trade_no = map.get("out_trade_no");
- String order_id = map.get("order_id");
- String s = icbcPayUtil.queryTransaction("", order_id);
- if(s.equals("0")){
- icbcPayUtil.answer(response);//回调应答
- }
- if(ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(order_id) && s.equals("0")){
- String[] split = out_trade_no.split(",");
+ String result = map.get("result");
+ String total_fee = map.get("total_fee");
+ String transaction_id = map.get("transaction_id");
+
+ if(ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(order_id)){
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ String[] split = out_trade_no.split("_");
Integer id = Integer.valueOf(split[0]);
Integer type = Integer.valueOf(split[1]);
switch (type){
case 1:
- orderPrivateCarService.payOrderPrivateCarCallback(id, order_id, 1);
break;
case 2:
- orderTaxiService.payOrderTaxiCallback(id, order_id, 1);
+ orderTaxiService.payOrderTaxiCallback(id, order_id, 2);
break;
case 3:
- orderCrossCityService.payOrderCrossCityCallback(id, order_id, 1);
break;
case 4:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
break;
case 5:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
break;
}
}
--
Gitblit v1.7.1