From b79eed290aa7f76545c1ad4b465362cec6b88bc9 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:24:27 +0800
Subject: [PATCH] 修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
index 214e75f..c1ed62c 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
@@ -316,8 +316,16 @@
orderTimeInfo.setStartServiceTime(sdf.format(orderLogistics.getStartServiceTime()));
}
long time = System.currentTimeMillis() - orderLogistics.getSnatchOrderTime().getTime() / 60000;
- //TODO 待翻译
- orderTimeInfo.setUsedTime(Double.valueOf(time / 60).intValue() + "小时" + time % 60 + "分钟");
+
+ int h = Double.valueOf(time / 60).intValue();
+ long m = time % 60;
+ String usedTime = "";
+ if(0 == h){
+ usedTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute" : m + "-minute";
+ }else{
+ usedTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute" : h + "-hour" + m + "-minute";
+ }
+ orderTimeInfo.setUsedTime(usedTime);
if(null != orderLogistics.getEndServiceTime()){
orderTimeInfo.setEndServiceTime(sdf.format(orderLogistics.getEndServiceTime()));
}
--
Gitblit v1.7.1