From 5321e3029faed64b250ec77b329a1ecd78086a23 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 13:56:25 +0800
Subject: [PATCH] 抢单处理推广
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 84 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 22 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 aee5467..b7aa424 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
@@ -12,6 +12,7 @@
import com.stylefeng.guns.modular.system.dao.CarServiceMapper;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
+import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
@@ -89,6 +90,13 @@
@Resource
private CarServiceMapper carServiceMapper;
+
+ @Resource
+ private UserInfoMapper userInfoMapper;
+
+
+ @Autowired
+ private TDriverPromotionActivityService driverPromotionActivityService;
@Resource
private RedisTemplate<String, Object> redisTemplate;
@@ -141,7 +149,7 @@
* @throws Exception
*/
@Override
- public synchronized ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
+ public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(null == orderPrivateCar){
return ResultUtil.error("订单已被抢了");
@@ -161,7 +169,7 @@
new EntityWrapper<OrderTaxi>()
.eq("type", 2)
.eq("userId", orderPrivateCar.getUserId())
- .ne("state", 1)
+ .notIn("state", 1,11)
.eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId())
.eq("place", orderPrivateCar.getPlace())
);
@@ -173,9 +181,15 @@
if(orderPrivateCar.getState() == 10){
return ResultUtil.error("订单已取消");
}
- if(orderPrivateCar.getState() != 1){
+ if(orderPrivateCar.getState() != 1 && orderPrivateCar.getState() != 11){
return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
}
+
+ Integer oldDriverId = null;
+ if(orderPrivateCar.getState()==11){
+ oldDriverId= orderPrivateCar.getDriverId();
+ }
+
Driver driver = driverService.selectById(uid);
if(orderPrivateCar.getType() == 3){
//批量订单
@@ -209,16 +223,22 @@
orderPrivateCar.setSnatchOrderTime(new Date());
//调用高德创建轨迹
- String s = gdFalconUtil.selectTerminal(driver.getPhone());
- String track = gdFalconUtil.createTrack(s);
- orderPrivateCar.setTrackId(track);
+// String s = gdFalconUtil.selectTerminal(driver.getPhone());
+// String track = gdFalconUtil.createTrack(s);
+// orderPrivateCar.setTrackId(track);
//调用移动的小号接口
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
- if(String.valueOf(map.get("code")).equals("200")){
- orderPrivateCar.setTelX(map.get("telX"));
- orderPrivateCar.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderPrivateCar.setTelX(map.get("telX"));
+// orderPrivateCar.setBindId(map.get("bindId"));
+// }
+
+
+
+ // 是否推广订单
+ Integer promotion = isPromotion(uid);
+ orderPrivateCar.setPromotion(promotion);
this.updateById(orderPrivateCar);
@@ -259,14 +279,22 @@
}
//推送相关代码------------------start----------------
+ Integer finalOldDriverId = oldDriverId;
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
- if(orderPrivateCar.getType() == 2){
- pushUtil.pushFerryOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 2);
+ if(finalOldDriverId !=null){
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
+ pushUtil.pushOrderReassign(orderPrivateCar.getUserId(),1 , orderPrivateCar.getId(), 1);
+ pushUtil.pushOrderReassign(finalOldDriverId,2, orderPrivateCar.getId(), 1);
+ }else {
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
+ if(orderPrivateCar.getType() == 2){
+ pushUtil.pushFerryOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 2);
+ }
}
+
}
}).start();
@@ -279,23 +307,35 @@
systemNoticeService.addSystemNotice(2, "您已成功抢得快车订单，请及时联系客户！", orderPrivateCar.getDriverId(), 1);
systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId(), 1);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){
+
+ if(pushMinistryOfTransport){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
//上传数据
pushMinistryOfTransportUtil.orderCreate(orderId);
pushMinistryOfTransportUtil.orderMatch(orderId);
}
- }
- }).start();
+ }).start();
+ }
+
return ResultUtil.success(orderPrivateCar.getId());
}
+ private Integer isPromotion(Integer userId){
+ UserInfo userInfo = userInfoMapper.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(" + 1 + ", bizType) limit 1"));
+ if(tDriverPromotionActivity!=null){
+ return 2;
+ }
+ }
+ return null;
+ }
/**
* 获取订单详情页（服务中的页面）
* @param orderId
--
Gitblit v1.7.1