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 | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 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 7f36fa0..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
@@ -23,10 +23,7 @@
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.*;
@@ -42,16 +39,13 @@
@Service
public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements ITOrderService {
- @Resource
+ @Autowired
private TOrderMapper tOrderMapper;
-
- @Resource
+ @Autowired
private TAppUserMapper tAppUserMapper;
-
- @Resource
+ @Autowired
private TDriverMapper tDriverMapper;
-
- @Resource
+ @Autowired
private TBranchOfficeMapper tBranchOfficeMapper;
@Override
@@ -73,7 +67,6 @@
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());//订单来源
@@ -110,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"), new MathContext(2, RoundingMode.HALF_EVEN));
- 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