From 388d1eb5f87c50ede6b415950899fe8bb938ee28 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 15:05:41 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 0a1733c..8837c49 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
@@ -703,6 +703,15 @@
 							orderPrivateCar.setIsDelete(1);
 							orderPrivateCar.setPid(orderPrivateCar1.getPid() == null ? orderPrivateCar1.getId() : orderPrivateCar1.getPid());
 
+							Integer promotion1 = isPromotion(orderPrivateCar.getUserId());
+							if(promotion1!=null){
+								orderPrivateCar.setPromotion(2);
+								Driver driver1 = driverService.selectById(promotion);
+								orderPrivateCar.setPromotionUser(driver1.getName());
+								orderPrivateCar.setPromotionPhone(driver1.getPhone());
+								orderPrivateCar.setPromotionDriverId(promotion1);
+							}
+
 							Company company = companyService.selectById(driver.getCompanyId());
 							//调三方订单中心创建行程单
 							CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
@@ -717,8 +726,8 @@
 							request.setServiceType(2);
 							String travelItinerary = OrderUtil.createTravelItinerary(request);
 							orderPrivateCar.setTravelId(travelItinerary);
-
 							this.insertOrUpdate(orderPrivateCar);
+
 							//修改总订单人数
 							OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
 							orderPrivateCar2.setSpellSuccess(1);
@@ -2994,6 +3003,7 @@
 				orderPrivateCar.setPromotionDriverId(userInfo.getBindDriverId());
 				orderPrivateCar.setPromotionMoney(bigDecimal);
 				orderPrivateCar.setPromotionActivityId(tDriverPromotionActivity.getId());
+				orderPrivateCar.setSuccessTime(new Date());
 				this.baseMapper.updateById(orderPrivateCar);
 			}
 		}

--
Gitblit v1.7.1