From 2eff47cee650f624b4fb61fb6f073e1e521b8082 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 20:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
index 1b8b28a..3ec3535 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
@@ -718,42 +718,42 @@
tOrderPrivateCarService.updateById(tOrderPrivateCar);
}
//使用备付金进行支付订单
- TradePayOffData tradePayOffData = new TradePayOffData();
- tradePayOffData.setPartnerPayId(tOrderPrivateCar.getTravelId());
- tradePayOffData.setTotalFee(tOrderPrivateCar.getOrderMoney().multiply(new BigDecimal(100)).toString());
- tradePayOffData.setOrderDesc("完成订单");
- PayInfo payInfo = com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil.tradePayOff(tradePayOffData);
- String retCode = payInfo.getRetCode();
- if (!"000000".equals(retCode)) {
- log.error("备付金支付失败：{}", payInfo.getRetMsg());
- return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
- }
- PayInfoData data = payInfo.getData();
- String status = data.getStatus();
- if ("3".equals(status)) {
- log.error("备付金支付失败：{}", payInfo.getRetMsg());
- return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
- }
- if("0".equals(status)){
- //查询支付信息
- GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest();
- getPaymentInfoDataRequest.setPartnerPayId(tOrderPrivateCar.getTravelId());
- GetPaymentInfo getPaymentInfo = com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil.paymentInfo(getPaymentInfoDataRequest);
- status = getPaymentInfo.getStatus();
- }
- PayInfoData payInfoData = payInfo.getData();
- PaymentInfo paymentInfo = payInfoData.getPaymentInfos().get(0);
- if(!"0".equals(status)) {
- //支付成功，通知三方
- PaymentOrderRequest paymentOrderRequest = new PaymentOrderRequest();
- paymentOrderRequest.setPayItemId(paymentInfo.getPayItemId());
- paymentOrderRequest.setPaymentInfo(JSON.toJSONString(payInfoData.getPaymentInfos()));
- paymentOrderRequest.setOrderId(tOrderPrivateCar.getTravelId());
- paymentOrderRequest.setCharge(tOrderPrivateCar.getOrderMoney());
- paymentOrderRequest.setPayTime(data.getPayTime());
- paymentOrderRequest.setPaymentSerialNumber(payInfoData.getPayId());
- OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest);
-
+// TradePayOffData tradePayOffData = new TradePayOffData();
+// tradePayOffData.setPartnerPayId(tOrderPrivateCar.getTravelId());
+// tradePayOffData.setTotalFee(tOrderPrivateCar.getOrderMoney().multiply(new BigDecimal(100)).toString());
+// tradePayOffData.setOrderDesc("完成订单");
+// PayInfo payInfo = com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil.tradePayOff(tradePayOffData);
+// String retCode = payInfo.getRetCode();
+// if (!"000000".equals(retCode)) {
+// log.error("备付金支付失败：{}", payInfo.getRetMsg());
+// return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
+// }
+// PayInfoData data = payInfo.getData();
+// String status = data.getStatus();
+// if ("3".equals(status)) {
+// log.error("备付金支付失败：{}", payInfo.getRetMsg());
+// return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
+// }
+// if("0".equals(status)){
+// //查询支付信息
+// GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest();
+// getPaymentInfoDataRequest.setPartnerPayId(tOrderPrivateCar.getTravelId());
+// GetPaymentInfo getPaymentInfo = com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil.paymentInfo(getPaymentInfoDataRequest);
+// status = getPaymentInfo.getStatus();
+// }
+// PayInfoData payInfoData = payInfo.getData();
+// PaymentInfo paymentInfo = payInfoData.getPaymentInfos().get(0);
+// if(!"0".equals(status)) {
+// //支付成功，通知三方
+// PaymentOrderRequest paymentOrderRequest = new PaymentOrderRequest();
+// paymentOrderRequest.setPayItemId(paymentInfo.getPayItemId());
+// paymentOrderRequest.setPaymentInfo(JSON.toJSONString(payInfoData.getPaymentInfos()));
+// paymentOrderRequest.setOrderId(tOrderPrivateCar.getTravelId());
+// paymentOrderRequest.setCharge(tOrderPrivateCar.getOrderMoney());
+// paymentOrderRequest.setPayTime(data.getPayTime());
+// paymentOrderRequest.setPaymentSerialNumber(payInfoData.getPayId());
+// OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest);
+//
//添加收入
Map<String, Object> map = null;
try {
@@ -776,7 +776,8 @@
request1.setPromoterId(driver2.getEmpId().toString());
}
OrderUtil.modifyTravelItinerary(request1);
- }
+// }
+
tOrderPrivateCar.setPayType(5);
tOrderPrivateCar.setPayMoney(tOrderPrivateCar.getOrderMoney());
--
Gitblit v1.7.1