From 9317fed1cea5372d9997a8273c07f041db94f99c Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 28 五月 2024 09:40:11 +0800
Subject: [PATCH] 新增功能
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 9c0cb83..107208a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -11,13 +11,11 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsSpreadService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
-import com.stylefeng.guns.modular.system.dao.CarMapper;
-import com.stylefeng.guns.modular.system.dao.RegionMapper;
-import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
-import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
+import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.util.quartz.QuartzUtil;
import com.stylefeng.guns.modular.system.util.quartz.jobs.OrderTimeOutJob;
@@ -115,6 +113,15 @@
@Resource
private SystemPriceMapper systemPriceMapper;
+
+ @Autowired
+ private FleetEngineUtil fleetEngineUtil;
+
+ @Resource
+ private CarModelMapper carModelMapper;
+
+ @Autowired
+ private ICarService carService;
@@ -154,6 +161,7 @@
if(orderLogistics.getState() != 1){
return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
+
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
orderLogistics.setCarId(driver.getCarId());
@@ -163,9 +171,10 @@
orderLogistics.setSnatchOrderTime(new Date());
this.updateById(orderLogistics);
+ //修改司机为服务中
+ driver.setState(3);
+ driverService.updateById(driver);
-
- //todo 待翻译
//添加定时任务(普通任务)
ReminderRules reminderRules = reminderRulesService.selectOne(new EntityWrapper<ReminderRules>().eq("companyId", driver.getCompanyId()));
if(null != reminderRules){
@@ -176,13 +185,26 @@
jobDataMap.put("driverId", uid);
jobDataMap.put("orderId", orderLogistics.getId());
jobDataMap.put("orderType", 4);
- jobDataMap.put("describe", "您的打车订单已超时" + m + "分钟，请抓紧！");
+ jobDataMap.put("describe", language == 1 ? "您的包裹订单已超时" + m + "分钟，请抓紧！" : language == 2 ? "Your delivery order is overdue for " + m + " minute(s), please go faster." : "Votre commande de livraison est en retard depuis " + m + " minute(s), veuillez aller plus vite.");
QuartzUtil.addSimpleQuartzTask(
new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderLogistics.getId() + "_4", "ORDER_TIME_OUT", jobDataMap)
, new Date(packageTimeoutReminderInterval), packageTimeoutReminderInterval, -1);
}
-
-
+
+ String trip = fleetEngineUtil.getTrip(1, orderLogistics.getId());
+ if(ToolUtil.isEmpty(trip)){
+ String vehicles = fleetEngineUtil.getVehicles(orderLogistics.getCarId());
+ if(ToolUtil.isEmpty(vehicles)){
+ Car car = carService.selectById(orderLogistics.getCarId());
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getId());
+ }
+ fleetEngineUtil.createTrip(orderLogistics.getCarId(), 1, 4, orderLogistics.getId(),
+ orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ }else{
+ //开始修改行程数据
+ fleetEngineUtil.updateTrip(null, driver.getCarId(), null, 4, orderLogistics.getId(), null, null, null, null);
+ }
//推送相关代码------------------start----------------
new Thread(new Runnable() {
@@ -254,19 +276,22 @@
}
List<OrderLogisticsSpread> orderLogisticsId = spreadService.selectList(new EntityWrapper<OrderLogisticsSpread>().eq("orderLogisticsId", orderLogistics.getId()).eq("payType",4));
-
-
+
+
+ String tripStatus = "UNKNOWN_TRIP_STATUS";
switch (state){
case 3://出发前往预约点
orderLogistics.setState(3);
orderLogistics.setSetOutTime(new Date());
systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderLogistics.getUserId());
pushUtil.pushDriverPosition(orderId, 4);
+ tripStatus = "ENROUTE_TO_PICKUP";
break;
case 4://到达预约点，等待客户上车
orderLogistics.setState(4);
orderLogistics.setArriveTime(new Date());
systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点。" : language == 2 ? "The driver has arrived at the reserved location." : "Le chauffeur est arrivé à l'endroit prévu.", orderLogistics.getUserId());
+ tripStatus = "ARRIVED_AT_PICKUP";
break;
case 5://开始服务
orderLogistics.setBoardingLon(lon);
@@ -275,6 +300,7 @@
orderLogistics.setBoardingTime(new Date());
orderLogistics.setState(5);
orderLogistics.setStartServiceTime(new Date());
+ tripStatus = "ENROUTE_TO_DROPOFF";
break;
case 6://结束服务
orderLogistics.setGetoffLon(lon);
@@ -283,9 +309,14 @@
orderLogistics.setGetoffTime(new Date());
orderLogistics.setEndServiceTime(new Date());
orderLogistics.setState(6);
+ tripStatus = "COMPLETE";
break;
}
this.updateById(orderLogistics);
+
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ //修改行程数据
+ fleetEngineUtil.updateTrip(tripStatus, null, null, 4, orderLogistics.getId(), null, null, null, null);
// TODO: 2020/6/5 推送状态
new Thread(new Runnable() {
@@ -788,7 +819,6 @@
}
amount = num25 + (d1 * num26) + (t1 * num27) + (w1 * num7) + yt1 + yt2 + yt3;
orderLogistics.setStartMileage(num2);
- orderLogistics.setStartDuration((int)(num3.doubleValue()));
orderLogistics.setStartMoney(num25);//起步价
orderLogistics.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
orderLogistics.setMileageMoney(new BigDecimal(d1 * num26).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
@@ -805,13 +835,7 @@
orderLogistics.setDiscount(0D);//优惠抵扣
orderLogistics.setPayMoney(0D);//支付金额
orderLogistics.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-
- orderLogistics.setMoneyType(3);
- if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis())){
- orderLogistics.setMoneyTime(num23);
- }else{
- orderLogistics.setMoneyTime(num24);
- }
+
return orderLogistics;
}
@@ -834,7 +858,6 @@
}
amount = num1 + (d1 * num4) + (t1 * num5) + (w1 * num7) + yt1 + yt2 + yt3;
orderLogistics.setStartMileage(num2);
- orderLogistics.setStartDuration((int)(num3.doubleValue()));
orderLogistics.setStartMoney(num1);//起步价
orderLogistics.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
orderLogistics.setMileageMoney(new BigDecimal(d1 * num4).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
@@ -852,7 +875,6 @@
orderLogistics.setPayMoney(0D);//支付金额
orderLogistics.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderLogistics.setMoneyType(1);
return orderLogistics;
}
@@ -887,7 +909,6 @@
if(userInfo.getFreeMoney().doubleValue()>0d){
if(orderLogistics.getOrderMoney()<=userInfo.getFreeMoney().doubleValue()){
orderLogistics.setState(8);
- orderLogistics.setIsFree(2);
//添加已收入明细
Company company = companyService.selectById(orderLogistics.getCompanyId());
Double speMoney = company.getSpeMoney();
--
Gitblit v1.7.1