From 8f659c583bf38eb1fecc8c7790b56d268225eb19 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 17:58:07 +0800
Subject: [PATCH] 活动

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 71e81a5..3391ffb 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
@@ -212,8 +212,15 @@
 //        }
 
         // 是否推广订单
+        // 是否推广订单
         Integer promotion = isPromotion(uid);
-        orderTaxi.setPromotion(promotion);
+        if(promotion!=null){
+            orderTaxi.setPromotion(2);
+            Driver driver1 = driverService.selectById(promotion);
+            orderTaxi.setPromotionUser(driver1.getName());
+            orderTaxi.setPromotionPhone(driver1.getPhone());
+            orderTaxi.setPromotionDriverId(promotion);
+        }
 
         this.updateById(orderTaxi);
 
@@ -293,7 +300,7 @@
             String registAreaCode = userInfo.getRegistAreaCode();
             TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
             if(tDriverPromotionActivity!=null){
-                return 2;
+                return userInfo.getBindDriverId();
             }
         }
         return null;

--
Gitblit v1.7.1