From 614bd1bf3f00e15d18f7d137c0a31db1c440ab82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 12 Aug 2024 21:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E5=9B=9B=E8=88=8D=E4=BA=94?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserPackageOrderServiceImpl.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
index d023866..c238607 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
@@ -271,7 +271,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                     BigDecimal vipMoney = canVipMoney;
                     BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
                     canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
-                    canVipMoney = canVipMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
+                    canVipMoney = canVipMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
                     BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
                     userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
                     totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
@@ -406,7 +406,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                     BigDecimal vipMoney = canVipMoney;
                     BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
                     canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
-                    canVipMoney = canVipMoney.setScale(0,BigDecimal.ROUND_HALF_UP);
+                    canVipMoney = canVipMoney.setScale(2,BigDecimal.ROUND_HALF_UP);
                     BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
                     userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
                     totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
@@ -713,7 +713,6 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
             for (UserPackageOrdersMapping ordersPackage : ordersPackageList) {
                 MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
                 BigDecimal sum = massagePackage.getPrice().multiply(new BigDecimal(ordersPackage.getNum()));
-                sum = sum.setScale(0,BigDecimal.ROUND_HALF_UP);
                 if(massagePackage.getIsCanCoupon() == 1){
                     canCouponMoney = canCouponMoney.add(sum);
                 }
@@ -788,7 +787,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                 BigDecimal vipMoney = canVipMoney;
                 BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
                 canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
-                canVipMoney = canVipMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
+                canVipMoney = canVipMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
                 BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
                 userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
                 totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
@@ -1000,7 +999,6 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
             for (UserPackageOrdersMapping ordersPackage : ordersPackageList) {
                 MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
                 BigDecimal sum = massagePackage.getPrice().multiply(new BigDecimal(ordersPackage.getNum()));
-                sum = sum.setScale(0,BigDecimal.ROUND_HALF_UP);
                 if(massagePackage.getIsCanCoupon() == 1){
                     canCouponMoney = canCouponMoney.add(sum);
                 }
@@ -1074,13 +1072,13 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                 BigDecimal vipMoney = canVipMoney;
                 BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
                 canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
-                canVipMoney = canVipMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
+                canVipMoney = canVipMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
                 BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
                 userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
                 totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
                 totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
             }
-                userPackageOrder.setPayMoney(totalMoney);
+            userPackageOrder.setPayMoney(totalMoney);
             userPackageOrder.setCreateTime(DateUtils.format(new Date()));
             userPackageOrder.setStatus(0);
             userPackageOrder.setOrdersNo(getGeneralOrder());