From b58aa9e68a30029423c57886a0a30896d833cb44 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 10 八月 2023 10:13:47 +0800
Subject: [PATCH] 合并代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 dd68d6a..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());//实际支付费用
--
Gitblit v1.7.1