From b8143019423b5bb1344d26f6da594c9908783909 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 18 八月 2025 02:17:21 +0800
Subject: [PATCH] 优化
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 28 +++++++++++++++++++++++++---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java | 2 +-
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 2 +-
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 1 +
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 4 ++--
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 3 ++-
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 18c58b4..d6c9495 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -55,6 +55,7 @@
import java.math.MathContext;
import java.math.RoundingMode;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -733,6 +734,7 @@
//推单操作
if(orderCrossCity.getState() == 1){
this.pushCrossCityOrder(orderCrossCity);
+ System.out.println("推单！！");
}
} catch (Exception e) {
e.printStackTrace();
@@ -2477,7 +2479,10 @@
LocalDateTime localDateTime = LocalDateTime.now();
LocalDateTime dateTime = localDateTime.minusMinutes(30);
String time = dateUtil.localDateTimeToStringHHmm(dateTime);
- List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 7).like("insertTime", time));
+ LocalDateTime start = LocalDateTime.parse(time + ":00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ LocalDateTime end = start.plusMinutes(1);
+
+ List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 7).between("insertTime", start, end));
if(!CollectionUtils.isEmpty(orderCrossCities)){
for (OrderCrossCity orderCrossCity : orderCrossCities) {
orderCrossCity.setState(10);
@@ -2525,14 +2530,15 @@
if(ToolUtil.isNotEmpty(vehicle)){
integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
}
- Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
+// Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
// List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
+ Company query = companyService.selectById(1);
for(int i = 1; i <= 3; i++){
PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
//获取空闲司机
// List<Driver> list = driverService.queryIdleDriver(1, orderCrossCity.getServerCarModelId(), orderCrossCity.getStartLon(), orderCrossCity.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
//获取同线路的同车型的跨城司机
- List<Driver> list = driverService.queryDriversByLineAndCarModel(orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
+ List<Driver> list = driverService.queryDriversByLineAndCarModel(3,orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
if(list.size() > 0){
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
@@ -2560,6 +2566,22 @@
if(i == 3 && state == 1){
pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
orderIds.remove(orderCrossCity.getId());
+ OrderCrossCity orderCrossCity1 = orderCrossCityMapper.selectById(orderCrossCity.getId());
+// if(orderCrossCity1.getState() == 7 && orderCrossCity1.getPayMoney() == null){
+ orderCrossCity1.setState(10);
+ orderCrossCityMapper.updateById(orderCrossCity1);
+
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(orderCrossCity.getId());
+ orderCancel.setOrderType(3);
+ orderCancel.setReason("没有司机接单，系统自动取消订单");
+ orderCancel.setRemark("没有司机接单，系统自动取消订单");
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancel.setUserType(2);
+ orderCancelService.insert(orderCancel);
+ //TODO：退款
+// }
}
}
} catch (Exception e) {
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java
index a9b7680..9186764 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java
@@ -48,5 +48,5 @@
* @return
* @throws Exception
*/
- List<Driver> queryDriversByLineAndCarModel (@Param("serverCarModelId") Integer serverCarModelId, @Param("lineId") Integer lineId );
+ List<Driver> queryDriversByLineAndCarModel (@Param("type")Integer type,@Param("serverCarModelId") Integer serverCarModelId, @Param("lineId") Integer lineId );
}
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index b040aee..47bc7dc 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -404,5 +404,6 @@
and serverCarModelId = #{serverCarModelId}
</if>
)
+ and id in (select driverId from t_driver_line where `lineId` = #{lineId})
</select>
</mapper>
\ No newline at end of file
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index f27e6e1..d4cb339 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
@@ -70,5 +70,5 @@
* @return
* @throws Exception
*/
- List<Driver> queryDriversByLineAndCarModel (Integer serverCarModelId, Integer lineId ) throws Exception;
+ List<Driver> queryDriversByLineAndCarModel (Integer type ,Integer serverCarModelId, Integer lineId ) throws Exception;
}
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index d1e4ff8..36d87d7 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -49,7 +49,8 @@
*/
@Override
public Company query(String code) throws Exception {
- if(code.equals(""))code="370500";
+// if(code.equals(""))code="370500";
+ if (code == null)code="370500";
String province = code.substring(0, 2) + "0000";
String city = code.substring(0, 4) + "00";
List<Company> query = companyMapper.query(province, city, code);
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 6fcee03..02fceb1 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -196,8 +196,8 @@
}
@Override
- public List<Driver> queryDriversByLineAndCarModel(Integer serverCarModelId, Integer lineId) throws Exception {
- List<Driver> drivers = driverMapper.queryDriversByLineAndCarModel(serverCarModelId, lineId);
+ public List<Driver> queryDriversByLineAndCarModel(Integer type,Integer serverCarModelId, Integer lineId) throws Exception {
+ List<Driver> drivers = driverMapper.queryDriversByLineAndCarModel( type,serverCarModelId, lineId);
return drivers;
}
}
--
Gitblit v1.7.1