From 53ff6ea7033a550d89368aa3c52377bf2184c5f4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 12 八月 2024 20:54:25 +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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 15a69e6..b7741c2 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
@@ -72,6 +72,9 @@
@Autowired
private FleetEngineUtil fleetEngineUtil;
+
+ @Resource
+ private ITUserService userService;
@@ -621,12 +624,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