From 88cef01ecd2b2cea73615bbab087342db3b05b23 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 15 六月 2023 15:57:07 +0800
Subject: [PATCH] 95折修改
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html | 2 +-
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 5 +++--
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html | 2 +-
3 files changed, 5 insertions(+), 4 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 aa9408c..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
@@ -111,8 +111,9 @@
if(Objects.nonNull(tAppUser)){
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);
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
index a33026c..d1cbee6 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
@@ -172,7 +172,7 @@
@if(havDiscount == 1){
<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >9折优惠:</label>
+ <label class="control-label" >95折优惠:</label>
<label>${multiply}</label>
<label>元</label>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html
index ef5bc4b..e4d1bce 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html
@@ -33,7 +33,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span class="control-label" >余额充值满</span>
<input class="control-label" id="num2" name="num2" value="${num2}" type="number" min="0" style="height: 30px;width: 80px">
- <span class="control-label" >元,获得9折优惠权限</span>
+ <span class="control-label" >元,获得95折优惠权限</span>
</div>
</div>
--
Gitblit v1.7.1