From c667e50f6e366d450ec77443746440fa8bca4723 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 01 八月 2025 17:47:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 90700fe..5cc01b3 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -241,15 +241,15 @@
// 是否推广订单
Integer promotion = isPromotion(orderPrivateCar.getUserId());
- if(promotion!=null){
+ if(null != promotion){
orderPrivateCar.setPromotion(2);
Driver driver1 = driverService.selectById(promotion);
orderPrivateCar.setPromotionUser(driver1.getName());
orderPrivateCar.setPromotionPhone(driver1.getPhone());
orderPrivateCar.setPromotionDriverId(promotion);
+ }else{
+ orderPrivateCar.setPromotion(1);
}
-
- orderPrivateCar.setPromotion(promotion);
if(null == oldDriverId){
UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
@@ -373,7 +373,7 @@
String registAreaCode = userInfo.getRegistAreaCode();
TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).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