From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 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 9828cbe..9f72853 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
@@ -94,7 +94,7 @@
         }
         model.addAttribute("startPrice",tOrder.getStartPrice());//起步价
         model.addAttribute("overDrivePrice",tOrder.getOverDrivePrice());//里程费
-        model.addAttribute("waitTimePrice",tOrder.getWaitTimePrice());//等待费
+        model.addAttribute("waitTimePrice",tOrder.getWaitTimePrice().add(tOrder.getOutWaitTimePrice()));//等待费
         model.addAttribute("badWeatherPrice",tOrder.getBadWeatherPrice());//恶劣天气费用
         model.addAttribute("orderMoney",tOrder.getOrderMoney());//实际费用
         model.addAttribute("payMoney",tOrder.getPayMoney());//实际支付费用
@@ -106,22 +106,13 @@
 
         // 查询用户
         TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
-        if(Objects.nonNull(tAppUser)){
-            model.addAttribute("userName",tAppUser.getNickname());
-            model.addAttribute("userPhone",tAppUser.getPhone());
-            model.addAttribute("havDiscount",tAppUser.getHavDiscount());
-            if(1 == tAppUser.getHavDiscount()){
-                // 计算9折优惠金额
-                BigDecimal multiply = tOrder.getOrderMoney().multiply(new BigDecimal("0.1")).setScale(2);
-                model.addAttribute("multiply",multiply);
-            }else {
-                model.addAttribute("multiply",0);
-            }
-        }else {
-            model.addAttribute("userName","");
-            model.addAttribute("userPhone","");
-            model.addAttribute("havDiscount","");
-            model.addAttribute("multiply",0);
+        model.addAttribute("userName",tAppUser.getNickname());
+        model.addAttribute("userPhone",tAppUser.getPhone());
+        model.addAttribute("havDiscount",tAppUser.getHavDiscount());
+        if(1 == tAppUser.getHavDiscount()){
+            // 计算9折优惠金额
+            BigDecimal multiply = tOrder.getOrderMoney().multiply(new BigDecimal("0.1")).setScale(2);
+            model.addAttribute("multiply",multiply);
         }
 
         // 查询司机

--
Gitblit v1.7.1