From ba165ef7ca1573df70dc66b786da6be4eb60380b Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 01 八月 2025 19:05:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 7bcf42c..d1075d1 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -222,6 +222,8 @@
             orderTaxi.setPromotionUser(driver1.getName());
             orderTaxi.setPromotionPhone(driver1.getPhone());
             orderTaxi.setPromotionDriverId(promotion);
+        }else{
+            orderTaxi.setPromotion(1);
         }
         
         if(null == oldDriverId){

--
Gitblit v1.7.1