DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -153,7 +153,6 @@ } /** * 获取司机端首页订单列表 * @param state 1=服务中，2=待服务（30分钟定义预约） @@ -215,7 +214,6 @@ } /** * 走订单流程操作 * @param orderId @@ -257,12 +255,14 @@ //还原座位数 LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); if (lineShiftDriver != null) { lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber( (ToolUtil.isNotEmpty(lineShiftDriver.getLaveSeatNumber()) ? lineShiftDriver.getLaveSeatNumber() + "," : "") + orderCrossCity.getSeatNumber() ); lineShiftDriverMapper.updateById(lineShiftDriver); } //修改司机空闲状态 List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryWithin30Minutes(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11); @@ -371,9 +371,6 @@ } } /** @@ -645,8 +642,6 @@ } /** * 计算支付金额 * @param startLonLat @@ -667,8 +662,6 @@ } return ResultUtil.error("计算行程距离出错啦！"); } /** @@ -719,7 +712,6 @@ this.updateAllColumnById(orderCrossCity); return resultUtil; } /** @@ -949,8 +941,6 @@ } /** * 获取订单编号 * @return @@ -1010,7 +1000,6 @@ // return ResultUtil.error("司机车辆没有剩余空位了"); // } // } orderCrossCity.setDriverId(uid); DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverLineMapper.java
New file @@ -0,0 +1,15 @@ package com.stylefeng.guns.modular.system.dao; import com.stylefeng.guns.modular.system.model.TDriverLine; import com.baomidou.mybatisplus.mapper.BaseMapper; /** * @author xy * @description 针对表【t_driver_line(司机关联线路)】的数据库操作Mapper * @createDate 2025-08-14 16:44:12 * @Entity com.stylefeng.guns.modular.system.model.TDriverLine */ public interface TDriverLineMapper extends BaseMapper<TDriverLine> { } DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverLineMapper.xml
New file @@ -0,0 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.stylefeng.guns.modular.system.dao.TDriverLineMapper"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TDriverLine"> <id property="id" column="id" jdbcType="INTEGER"/> <result property="driverid" column="driverId" jdbcType="INTEGER"/> <result property="lineid" column="lineId" jdbcType="INTEGER"/> <result property="createtime" column="createTime" jdbcType="TIMESTAMP"/> <result property="addtime" column="addTime" jdbcType="VARCHAR"/> </resultMap> <sql id="Base_Column_List"> id,driverId,lineId, createTime,addTime </sql> </mapper> DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverLine.java
New file @@ -0,0 +1,160 @@ package com.stylefeng.guns.modular.system.model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; import java.util.Date; /** * 司机关联线路 * @TableName t_driver_line */ @TableName(value ="t_driver_line") public class TDriverLine implements Serializable { /** * */ @TableId private Integer id; /** * 司机id */ private Integer driverid; /** * 线路id */ private Integer lineid; /** * 创建时间 */ private Date createtime; /** * 添加时间【后台使用】 */ private String addtime; @TableField(exist = false) private static final long serialVersionUID = 1L; /** * */ public Integer getId() { return id; } /** * */ public void setId(Integer id) { this.id = id; } /** * 司机id */ public Integer getDriverid() { return driverid; } /** * 司机id */ public void setDriverid(Integer driverid) { this.driverid = driverid; } /** * 线路id */ public Integer getLineid() { return lineid; } /** * 线路id */ public void setLineid(Integer lineid) { this.lineid = lineid; } /** * 创建时间 */ public Date getCreatetime() { return createtime; } /** * 创建时间 */ public void setCreatetime(Date createtime) { this.createtime = createtime; } /** * 添加时间【后台使用】 */ public String getAddtime() { return addtime; } /** * 添加时间【后台使用】 */ public void setAddtime(String addtime) { this.addtime = addtime; } @Override public boolean equals(Object that) { if (this == that) { return true; } if (that == null) { return false; } if (getClass() != that.getClass()) { return false; } TDriverLine other = (TDriverLine) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getDriverid() == null ? other.getDriverid() == null : this.getDriverid().equals(other.getDriverid())) && (this.getLineid() == null ? other.getLineid() == null : this.getLineid().equals(other.getLineid())) && (this.getCreatetime() == null ? other.getCreatetime() == null : this.getCreatetime().equals(other.getCreatetime())) && (this.getAddtime() == null ? other.getAddtime() == null : this.getAddtime().equals(other.getAddtime())); } @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getDriverid() == null) ? 0 : getDriverid().hashCode()); result = prime * result + ((getLineid() == null) ? 0 : getLineid().hashCode()); result = prime * result + ((getCreatetime() == null) ? 0 : getCreatetime().hashCode()); result = prime * result + ((getAddtime() == null) ? 0 : getAddtime().hashCode()); return result; } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append(getClass().getSimpleName()); sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", driverid=").append(driverid); sb.append(", lineid=").append(lineid); sb.append(", createtime=").append(createtime); sb.append(", addtime=").append(addtime); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); } } DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/TDriverLineService.java
New file @@ -0,0 +1,13 @@ package com.stylefeng.guns.modular.system.service; import com.stylefeng.guns.modular.system.model.TDriverLine; import com.baomidou.mybatisplus.service.IService; /** * @author xy * @description 针对表【t_driver_line(司机关联线路)】的数据库操作Service * @createDate 2025-08-14 16:44:12 */ public interface TDriverLineService extends IService<TDriverLine> { } DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -371,12 +371,12 @@ break; case 3://城际 map = orderCrossCityService.queryPushOrder(orderId); String order2 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat")); String distance2 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order2, 1).get("distance"); String order2 = String.valueOf(map.get("startLat")) + "," +String.valueOf(map.get("startLon")); String distance2 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, order2, 1).get("distance"); map.put("startDistance", ToolUtil.isNotEmpty(distance2) ? Double.valueOf(distance2) / 1000 : 0); //总距离 String end2 = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat")); String end2 =String.valueOf(map.get("endLat")) + "," + String.valueOf(map.get("endLon")) ; distance = gdMapElectricFenceUtil.getDistance(end2, order2, 1).get("distance"); map.put("totalDistance", ToolUtil.isNotEmpty(distance) ? Double.valueOf(distance) / 1000 : 0);
@@ -464,8 +464,11 @@ OrderCrossCity tOrderCrossCity = orderCrossCityService.selectById(tReassign.getOrderId()); Driver oldDriver = driverService.selectById(tReassign.getOriginalDriverId()); LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(tOrderCrossCity.getLineShiftDriverId()); if(lineShiftDriver!=null){ lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + tOrderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat() ? lineShiftDriver.getTotalSeat() : lineShiftDriver.getLaveSeat() + tOrderCrossCity.getPeopleNumber()); String seat = ""; String[] split = tOrderCrossCity.getSeatNumber().split(","); for(String s : split){ @@ -531,6 +534,8 @@ } lineShiftDriver1.setLaveSeatNumber(seat2); lineShiftDriverMapper.updateById(lineShiftDriver1); } Driver driver = driverService.selectById(driverId); // if(driver.getState() == 1){ // return ResultUtil.error("司机还未上班呢"); @@ -542,9 +547,9 @@ //修改订单数据 tOrderCrossCity.setDriverId(driverId); tOrderCrossCity.setCarId(driver.getCarId()); tOrderCrossCity.setSeatNumber(seat1); // tOrderCrossCity.setSeatNumber(seat1); tOrderCrossCity.setState(tOrderCrossCity.getOldState()); tOrderCrossCity.setLineShiftDriverId(lineShiftDriver1.getId()); // tOrderCrossCity.setLineShiftDriverId(lineShiftDriver1.getId()); tOrderCrossCity.setOldState(null); tOrderCrossCity.setIsReassign(2); try { @@ -553,7 +558,7 @@ e.printStackTrace(); } orderCrossCityService.updateAllColumnById(tOrderCrossCity); oldDriver.setState(2); //修改专车改派订单 tReassign.setNowDriverId(driverId); tReassign.setNowCarId(driver.getCarId()); DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverLineServiceImpl.java
New file @@ -0,0 +1,18 @@ package com.stylefeng.guns.modular.system.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.modular.system.model.TDriverLine; import com.stylefeng.guns.modular.system.service.TDriverLineService; import com.stylefeng.guns.modular.system.dao.TDriverLineMapper; import org.springframework.stereotype.Service; /** * @author xy * @description 针对表【t_driver_line(司机关联线路)】的数据库操作Service实现 * @createDate 2025-08-14 16:44:12 */ @Service public class TDriverLineServiceImpl extends ServiceImpl<TDriverLineMapper, TDriverLine> implements TDriverLineService { }
