From 496ef92b09b1be5dc1beb4ecf031cfc20edbeb94 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 11 五月 2026 13:59:14 +0800
Subject: [PATCH] fix bugs
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 73a3571..b85404c 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -254,11 +254,11 @@
serverMoney += income.getMoney();
}
}
- if (orderCrossCity.getLineId() == -1) {
+ if (orderCrossCity.getLineId() <= -1) {
LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
DriverSelfTrip driverSelfTrip = driverSelfTripMapper.selectById(lineShiftDriver.getCustomerId());
map.put("line", driverSelfTrip.getStartCityName() + "-" + driverSelfTrip.getEndCityName());
- map.put("lineId", -1);
+ map.put("lineId", orderCrossCity.getLineId());
} else {
Line line = lineService.selectById(orderCrossCity.getLineId());
map.put("line", line.getName());
@@ -1227,7 +1227,7 @@
map.put("price", -1);
return ResultUtil.success(map);
}
- if (lineId != null && lineId == -1) {
+ if (lineId != null && lineId <= -1) {
BigDecimal price = querySelfTripNearestPrice(lineShiftDriver, endLon, endLat);
map.put("price", price == null ? -1 : multiplyPeopleNumber(price, peopleNumber).doubleValue());
return ResultUtil.success(map);
@@ -1257,7 +1257,7 @@
map.put("price", unitPrice == null ? -1 : multiplyPeopleNumber(unitPrice, peopleNumber).doubleValue());
return ResultUtil.success(map);
}
- if (lineId != null && lineId == -1) {
+ if (lineId != null && lineId <= -1) {
if (lineShiftDriverId == null) {
map.put("price", -1);
return ResultUtil.success(map);
@@ -1553,7 +1553,7 @@
// 6. 获取线路班次信息
LineSite lineSite;
- if (lineShiftDriver.getLineShiftId() == -1) {
+ if (lineShiftDriver.getLineShiftId() <= -1) {
lineSite = new LineSite();
lineSite.setLineId(-1);
if (lineShiftDriver.getCustomerId() != null) {
--
Gitblit v1.7.1