From b77c1869930d044db13a0d4a672bf98da1cab2c2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 22 八月 2024 12:00:07 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 71 ++++++++++-------------------------
1 files changed, 21 insertions(+), 50 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 5d36cca..4a2465b 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;
@@ -202,6 +205,9 @@
TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(id);
orderPrivateCar.setAbnormalMoney(orderPrivateCar.getOrderMoney());
orderPrivateCar.setOrderMoney(money);
+ orderPrivateCar.setPayMoney(money);
+ orderPrivateCar.setState(7);
+ orderPrivateCar.setIsDispute(1);
orderPrivateCar.updateById();
return SUCCESS_TIP;
}
@@ -242,53 +248,16 @@
driver.setFrozenMoney(driver.getFrozenMoney().subtract(c));
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);
-// }
-// }).start();
-// }
+ if (orderPrivateCar.getIsFrozen() == 1){
+ // 冻结订单需要给司机推送一个消息;
+ TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, "");
+ }
+ }).start();
+ }
orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
orderPrivateCar.setState(7);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
@@ -570,12 +539,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