From 796dc4887bfc37eb29e5ac6c4737e51ff7ab4299 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 12 八月 2024 11:41:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 52 ++++++++++------------------------------------------
1 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 0a83283..9ab399f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -71,6 +71,9 @@
@Autowired
private FleetEngineUtil fleetEngineUtil;
+
+ @Resource
+ private ITUserService userService;
@@ -243,49 +246,12 @@
driverService.updateById(driver);
}
if (orderPrivateCar.getIsFrozen() == 1){
- // 冻结订单需要给司机播报一个语音内容
- Integer language1 = tDriver.getLanguage();
- String text = "";
- switch (language1){
- case 1:
- text = "" ;
- break;
- case 2:
- text = "";
- break;
- case 3:
- text = "";
- break;
- }
+ // 冻结订单需要给司机推送一个消息;
TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
- String audioUrl = "";
- try {
- audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- //定时任务删除语音文件
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- Process process = null;
- try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + finalOrderPrivateCar.getDriverId() + ".mp3");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- if (process != null) {
- process.destroy();
- }
- }
- }, 30000);
-
- String finalAudioUrl = audioUrl;
-
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);
+ pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, "");
}
}).start();
}
@@ -570,12 +536,14 @@
tOrderPrivateCar.setState(10);
tOrderPrivateCarService.updateById(tOrderPrivateCar);
-
+
+ TUser tUser = userService.selectById(tOrderPrivateCar.getUserId());
+ Integer language = tUser.getLanguage();
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tOrderPrivateCarId);
orderCancel.setOrderType(1);
- orderCancel.setReason("The platform cancels the order");
- orderCancel.setRemark("The platform cancels the order");
+ orderCancel.setReason(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande");
+ orderCancel.setRemark(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande");
orderCancel.setUserType(2);
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
--
Gitblit v1.7.1