From 1da73e129402bb3923e92f3d561ac49acc87fee5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 10 十月 2025 15:39:43 +0800
Subject: [PATCH] 删除不必要的日志
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 039b892..a89e9e8 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -101,6 +101,9 @@
@Value("${filePath}")
private String filePath;
+ @Autowired
+ private IAppOperationLogService appOperationLogService;
+
@@ -207,7 +210,7 @@
// }
// System.out.println(map);
this.updateById(orderPrivateCar);
-
+ appOperationLogService.addAppOperationLog(orderPrivateCar.getDriverId(), "{\"type\":\"司机抢单成功\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}");
//如果是预约单，则不修改司机为服务中
if(orderPrivateCar.getOrderType() != 2 || (orderPrivateCar.getOrderType() == 2 && orderPrivateCar.getTravelTime().getTime() < System.currentTimeMillis() + 600000)){
//修改司机为服务中
@@ -299,6 +302,7 @@
/*if(state==5 && orderPrivateCar.getState()!=4){
return ResultUtil.error("当前订单不能开始服务");
}*/
+ String stateName = "";
switch (state){
case 3://出发前往预约点
// 判断是否有其他未完成的单子
@@ -309,11 +313,13 @@
orderPrivateCar.setState(3);
orderPrivateCar.setSetOutTime(new Date());
systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderPrivateCar.getUserId());
+ stateName = "出发前往预约点";
break;
case 4://到达预约点，等待客户上车
orderPrivateCar.setState(4);
orderPrivateCar.setArriveTime(new Date());
systemNoticeService.addSystemNotice(1, "司机已到达您设置的预约地点，请及时上车", orderPrivateCar.getUserId());
+ stateName = "到达预约点，等待客户上车";
break;
case 5://开始服务
orderPrivateCar.setBoardingLon(lon);
@@ -324,7 +330,7 @@
orderPrivateCar.setStartServiceTime(new Date());
pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);//主动推送司机定位
-
+ stateName = "开始服务";
new Thread(new Runnable() {
@Override
public void run() {
@@ -340,7 +346,7 @@
orderPrivateCar.setGetoffAddress(address);
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
-
+ stateName = "结束服务";
// 结束服务时查询轨迹，计算距离
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
double sum = 0;
@@ -444,7 +450,7 @@
break;
}
this.updateById(orderPrivateCar);
-
+ appOperationLogService.addAppOperationLog(orderPrivateCar.getDriverId(), "{\"type\":\"司机操作订单，" + stateName + "\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}");
// TODO: 2020/6/5 推送状态
OrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
new Thread(new Runnable() {
@@ -647,7 +653,7 @@
// }
this.updateById(orderPrivateCar);
-
+ appOperationLogService.addAppOperationLog(orderPrivateCar.getDriverId(), "{\"type\":\"司机确认费用\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}");
pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());
@@ -1057,6 +1063,7 @@
orderPrivateCar.setPriceAuditState(1);
orderPrivateCar.setState(6);
this.updateById(orderPrivateCar);
+ appOperationLogService.addAppOperationLog(orderPrivateCar.getDriverId(), "{\"type\":\"司机修改费用\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}");
// 推送新的价格给用户
pushUtil.pushOrderMoney(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, updatePrice, 0);
pushUtil.pushOrderMoney(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, updatePrice, 0);
--
Gitblit v1.7.1