From 7de016fea904b91a4b9d4ff3264c779793cfb991 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 19:56:47 +0800
Subject: [PATCH] 更新订单管理页面
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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..9eaa306 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
@@ -23,7 +23,10 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+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.*;
@@ -39,13 +42,16 @@
@Service
public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements ITOrderService {
- @Autowired
+ @Resource
private TOrderMapper tOrderMapper;
- @Autowired
+
+ @Resource
private TAppUserMapper tAppUserMapper;
- @Autowired
+
+ @Resource
private TDriverMapper tDriverMapper;
- @Autowired
+
+ @Resource
private TBranchOfficeMapper tBranchOfficeMapper;
@Override
@@ -67,6 +73,7 @@
public void orderDetail(Integer orderId, Model model) {
// 订单信息
TOrder tOrder = tOrderMapper.selectById(orderId);
+ model.addAttribute("id", orderId);
model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getCreateTime()));//下单时间
model.addAttribute("code",tOrder.getCode());//订单编号
model.addAttribute("source",tOrder.getSource());//订单来源
@@ -76,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()));//乘车时间
@@ -105,6 +114,20 @@
model.addAttribute("routeRecord",tOrder.getRouteRecord());//行程录音
model.addAttribute("userPhone",tOrder.getUserPhone());//用户手机号
model.addAttribute("userName",tOrder.getUserName());//用户名称
+ if(null != tOrder.getActualMileage()){
+ model.addAttribute("actualMileage",new BigDecimal(tOrder.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//用户名称
+ }else{
+ model.addAttribute("actualMileage", 0);
+ }
+ if(null != tOrder.getGetoffTime() && null != tOrder.getBoardingTime()){
+ long t = tOrder.getGetoffTime().getTime() - tOrder.getBoardingTime().getTime();
+ int ti = Long.valueOf(t / 1000).intValue();
+ Integer s = ti % 60;
+ Integer m = ti / 60;
+ model.addAttribute("time", (m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));//用户名称
+ }else{
+ model.addAttribute("time", 0);
+ }
// 查询用户
TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
@@ -113,7 +136,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