From 0ffd0dc267f12e7208ea4c636ff1bf6771d43ad1 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 18 五月 2026 19:13:45 +0800
Subject: [PATCH] fix bugs
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java
index 51e56b2..acd8a8e 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java
@@ -71,8 +71,19 @@
if(c.getTimeInMillis() > sdf.parse(day).getTime()){
throw new SystemException("日期不能小于当天");
}
+
+ Boolean chooseSeat = false;
+ if (driverId != null) {
+ Integer chooseSeatValue = lineSiteMapper.queryChooseSeatByDriverId(driverId);
+ chooseSeat = (chooseSeatValue != null && chooseSeatValue.intValue() == 1);
+ }
+
if (lineId != null && lineId < 0) {
- return lineSiteMapper.queryDriverBySelfTripId(Math.abs(lineId), sdf.parse(day), driverId);
+ List<Map<String, Object>> result = lineSiteMapper.queryDriverBySelfTripId(Math.abs(lineId), sdf.parse(day), driverId);
+ for (Map<String, Object> map : result) {
+ map.put("chooseSeat", chooseSeat);
+ }
+ return result;
}
List<Map<String, Object>> list = new ArrayList<>();
List<LineShift> lineShifts = lineShiftMapper.queryByLineId(lineId);
@@ -128,6 +139,12 @@
String content = map.get("content").toString();
JSONObject jsonObject = JSON.parseObject(content);
map.put("price", jsonObject.getString("num1"));
+ if (chooseSeat){
+ map.put("chooseSeat", chooseSeat);
+ }else if (driverId == null){
+ Integer chooseSeatValue = lineSiteMapper.queryChooseSeatByDriverId(Integer.parseInt(map.get("driverId").toString()));
+ map.put("chooseSeat", chooseSeatValue != null && chooseSeatValue.intValue() == 1);
+ }
data = map;
list.add(data);
}
@@ -135,6 +152,7 @@
if(b){
data.put("id", lineShift.getId());
data.put("startTime", lineShift.getStartTime() + "-" + lineShift.getEndTime());
+ data.put("chooseSeat", chooseSeat);
list.add(data);
}
}
--
Gitblit v1.7.1