From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 6 +++++-
1 files changed, 5 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 d17ae67..8f3883c 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
@@ -25,6 +25,8 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -81,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()));//乘车时间
@@ -118,7 +122,7 @@
if(1 == tAppUser.getHavDiscount()){
BigDecimal subtract = tOrder.getOrderMoney().subtract(tOrder.getDiscountedPrice());
// 计算95折优惠金额
- BigDecimal multiply = subtract.multiply(new BigDecimal("0.05")).setScale(2);
+ BigDecimal multiply = subtract.multiply(new BigDecimal("0.05"), new MathContext(2, RoundingMode.HALF_EVEN));
model.addAttribute("multiply",multiply);
}else {
model.addAttribute("multiply",0);
--
Gitblit v1.7.1