From 85dda79557028b2543cba2bcec716721568559bf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:56:46 +0800
Subject: [PATCH] 修改支付查询判断逻辑

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index ddad3bd..780062c 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2323,12 +2323,11 @@
 						request.setCustomerId(userInfo.getOnconUUID());
 						request.setOrderNo("PR" + orderPrivateCar1.getId());
 						request.setDriverId(driver.getEmpId().toString());
-						ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
-						TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
-						if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
-							GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
-							getPaymentInfoDataRequest1.setPartnerPayId(orderPrivateCar1.getTravelId());
-							GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
+                        GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
+                        getPaymentInfoDataRequest1.setPartnerPayId(orderPrivateCar1.getTravelId());
+                        GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
+                        String status = getPaymentInfo1.getStatus();
+                        if("1".equals(status) || "2".equals(status)){
 							payOrderPrivateCarCallback(orderPrivateCar1.getId(), getPaymentInfo1.getPayId(), 1);
 							break;
 						}

--
Gitblit v1.7.1