From 1d1dbcdb6382b6c09fa0cdb6b0fbcbbea9e43e85 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 19:03:31 +0800
Subject: [PATCH] 跨城推广
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 259e58a..7bb2445 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1293,7 +1293,15 @@
// 是否推广订单
Integer promotion = isPromotion(uid);
- orderCrossCity.setPromotion(promotion);
+ if(promotion!=null){
+ orderCrossCity.setPromotion(2);
+ Driver driver1 = driverService.selectById(promotion);
+ orderCrossCity.setPromotionUser(driver1.getName());
+ orderCrossCity.setPromotionPhone(driver1.getPhone());
+ orderCrossCity.setPromotionDriverId(promotion);
+ }else{
+ orderCrossCity.setPromotion(1);
+ }
this.insert(orderCrossCity);
@@ -1388,17 +1396,17 @@
return ResultUtil.success(baseWarpper);
}
+
private Integer isPromotion(Integer userId){
UserInfo userInfo = userInfoService.selectById(userId);
if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
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(" + 3 + ", bizType) limit 1"));
+ TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 3 + ", bizType) limit 1"));
if(tDriverPromotionActivity!=null){
- return 2;
+ return userInfo.getBindDriverId();
}
}
return null;
-
}
/**
* 获取订单
--
Gitblit v1.7.1