From 7a9e05846c5e37f7278f242857056d0623532379 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 六月 2023 20:17:32 +0800
Subject: [PATCH] 修改bug和功能优化
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 9828cbe..832551d 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
@@ -103,24 +103,23 @@
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("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);
+ 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("userName","");
- model.addAttribute("userPhone","");
- model.addAttribute("havDiscount","");
+ model.addAttribute("havDiscount",0);
model.addAttribute("multiply",0);
}
--
Gitblit v1.7.1