From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +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 | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 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..8c7e85c 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
@@ -141,7 +141,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 +161,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 +173,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 +215,16 @@
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"));
+// }
this.updateById(orderPrivateCar);
@@ -259,14 +265,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,17 +293,18 @@
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());
}
--
Gitblit v1.7.1