From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index e7720dd..7fe2a3d 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -678,6 +678,16 @@
pushUtil.pushOrderState(2, driverId, id, orderType, state, 0);
}
break;
+
+ case 7:
+ OrderTransferCar orderTransferCar = orderTransferService.selectById(id);
+ driverId = orderTransferCar.getDriverId();
+ userId = orderTransferCar.getUserId();
+ state = orderTransferCar.getState();
+ if(null != driverId){
+ pushUtil.pushOrderState(2, driverId, id, orderType, state, 0);
+ }
+ break;
}
pushUtil.pushOrderState(1, userId, id, orderType, state, 0);
return ResultUtil.success();
@@ -1142,6 +1152,20 @@
orderCrossCity.setState(9);
orderCrossCityService.updateById(orderCrossCity);
break;
+ case 7:
+ OrderTransferCar orderTransferCar = orderTransferService.selectById(orderId);
+ orderTransferCar.setState(9);
+ orderTransferService.updateById(orderTransferCar);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.ratedPassenger(Integer.valueOf(resultUtil.getData().toString()));
+ pushMinistryOfTransportUtil.ratedDriver(orderTransferCar.getDriverId());
+ }
+ }
+ }).start();
+ break;
}
}
return resultUtil.getCode() == 200 ? ResultUtil.success() : resultUtil;
--
Gitblit v1.7.1