From de6605cf7988050e0d1c6261325c4e2e9f097788 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 12:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 57069a5..04a492b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -1196,7 +1196,7 @@
tradeOrderCreateData.setOrderDesc("完成订单");
tradeOrderCreateData.setRetUrl(path);
tradeOrderCreateData.setClientIp(ip);
- tradeOrderCreateData.setServiceType(3);
+ tradeOrderCreateData.setServiceType(5);
List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
@@ -1252,13 +1252,15 @@
request.setOrderNo("DJ" + order1.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(order1.getTravelId());
- GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
- orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());
- break;
+ if(!travelItineraryList.getList().isEmpty()){
+ TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
+ if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
+ GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
+ getPaymentInfoDataRequest1.setPartnerPayId(order1.getTravelId());
+ GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
+ orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());
+ break;
+ }
}
Thread.sleep(wait);
num++;
--
Gitblit v1.7.1