From ecf282fb285fbba74ff129a4be8a129aa0d8ceb1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 三月 2023 22:35:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 fba7e3b..01bdb4c 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
@@ -68,10 +68,27 @@
model.addAttribute("code",tOrder.getCode());//订单编号
model.addAttribute("source",tOrder.getSource());//订单来源
model.addAttribute("startAddress",tOrder.getStartAddress());//起点
+ model.addAttribute("startLng",tOrder.getStartLng());// 起点经度
+ model.addAttribute("startLat",tOrder.getStartLat());// 起点纬度
model.addAttribute("endAddress",tOrder.getEndAddress());//终点
- model.addAttribute("startTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getStartTime()));//乘车时间
- model.addAttribute("boardingTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getBoardingTime()));//上车时间
- model.addAttribute("getoffTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getGetoffTime()));//下车时间
+ model.addAttribute("endLng",tOrder.getEndLng());// 终点经度
+ model.addAttribute("endLat",tOrder.getEndLat());// 终点纬度
+
+ if(Objects.nonNull(tOrder.getStartTime())){
+ model.addAttribute("startTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getStartTime()));//乘车时间
+ }else {
+ model.addAttribute("startTime","");//乘车时间
+ }
+ if(Objects.nonNull(tOrder.getBoardingTime())){
+ model.addAttribute("boardingTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getBoardingTime()));//乘车时间
+ }else {
+ model.addAttribute("boardingTime","");//乘车时间
+ }
+ if(Objects.nonNull(tOrder.getGetoffTime())){
+ model.addAttribute("getoffTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getGetoffTime()));//乘车时间
+ }else {
+ model.addAttribute("getoffTime","");//乘车时间
+ }
model.addAttribute("startPrice",tOrder.getStartPrice());//起步价
model.addAttribute("overDrivePrice",tOrder.getOverDrivePrice());//里程费
model.addAttribute("waitTimePrice",tOrder.getWaitTimePrice());//等待费
@@ -82,6 +99,7 @@
model.addAttribute("payType",tOrder.getPayType());//支付方式
model.addAttribute("discountAmount",tOrder.getDiscountAmount());//折扣金额
model.addAttribute("userId",tOrder.getUserId());//用户id
+ model.addAttribute("routeRecord",tOrder.getRouteRecord());//行程录音
// 查询用户
TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
@@ -96,15 +114,20 @@
// 查询司机
TDriver tDriver = tDriverMapper.selectById(tOrder.getDriverId());
- model.addAttribute("driverName",tDriver.getName());
- model.addAttribute("driverPhone",tDriver.getPhone());
-
- // 查询司机所属分公司
- TBranchOffice tBranchOffice = tBranchOfficeMapper.selectById(tDriver.getBranchOfficeId());
- if(Objects.nonNull(tBranchOffice)){
- model.addAttribute("branchOfficeName",tBranchOffice.getPrincipal());
+ if(Objects.nonNull(tDriver)){
+ model.addAttribute("driverName",tDriver.getName());
+ model.addAttribute("driverPhone",tDriver.getPhone());
+ // 查询司机所属分公司
+ TBranchOffice tBranchOffice = tBranchOfficeMapper.selectById(tDriver.getBranchOfficeId());
+ if(Objects.nonNull(tBranchOffice)){
+ model.addAttribute("branchOfficeName",tBranchOffice.getPrincipal());
+ }else {
+ model.addAttribute("branchOfficeName","");
+ }
}else {
model.addAttribute("branchOfficeName","");
+ model.addAttribute("driverName","");
+ model.addAttribute("driverPhone","");
}
}
--
Gitblit v1.7.1