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 | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 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 832551d..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());//实际支付费用
@@ -103,24 +103,16 @@
model.addAttribute("discountAmount",tOrder.getDiscountAmount());//折扣金额
model.addAttribute("userId",tOrder.getUserId());//用户id
model.addAttribute("routeRecord",tOrder.getRouteRecord());//行程录音
- model.addAttribute("userPhone",tOrder.getUserPhone());//用户手机号
- model.addAttribute("userName",tOrder.getUserName());//用户名称
// 查询用户
TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
- if(Objects.nonNull(tAppUser)){
- model.addAttribute("havDiscount",tAppUser.getHavDiscount());
- if(1 == tAppUser.getHavDiscount()){
- BigDecimal subtract = tOrder.getOrderMoney().subtract(tOrder.getDiscountedPrice());
- // 计算95折优惠金额
- BigDecimal multiply = subtract.multiply(new BigDecimal("0.05")).setScale(2);
- model.addAttribute("multiply",multiply);
- }else {
- model.addAttribute("multiply",0);
- }
- }else {
- model.addAttribute("havDiscount",0);
- 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