From 46af9e53a6e76b6c0b8cc3291ac1d78e59370831 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 15 八月 2023 18:07:28 +0800
Subject: [PATCH] 更新管理页面

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 7f36fa0..9272d44 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -83,6 +83,8 @@
         model.addAttribute("endAddress",tOrder.getEndAddress());//终点
         model.addAttribute("endLng",tOrder.getEndLng());// 终点经度
         model.addAttribute("endLat",tOrder.getEndLat());// 终点纬度
+        model.addAttribute("boardingAddress", tOrder.getBoardingAddress());//上车点
+        model.addAttribute("debusAddress", tOrder.getDebusAddress());//下车点
 
         if(Objects.nonNull(tOrder.getStartTime())){
             model.addAttribute("startTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getStartTime()));//乘车时间
@@ -113,6 +115,21 @@
         model.addAttribute("userPhone",tOrder.getUserPhone());//用户手机号
         model.addAttribute("userName",tOrder.getUserName());//用户名称
 
+        if(null != tOrder.getActualMileage()){
+            model.addAttribute("actualMileage",new BigDecimal(tOrder.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//用户名称
+        }else{
+            model.addAttribute("actualMileage", 0);
+        }
+        if(null != tOrder.getGetoffTime() && null != tOrder.getBoardingTime()){
+            long t = tOrder.getGetoffTime().getTime() - tOrder.getBoardingTime().getTime();
+            int ti = Long.valueOf(t / 1000).intValue();
+            Integer s = ti % 60;
+            Integer m = ti / 60;
+            model.addAttribute("time", (m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));//用户名称
+        }else{
+            model.addAttribute("time", 0);
+        }
+
         // 查询用户
         TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
         if(Objects.nonNull(tAppUser)){

--
Gitblit v1.7.1