From acbfa87dbe860891d5617dffe50638a28dd67a4e 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:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E4=BC=98=E6=83=A0=E5=87=8F?=
 =?UTF-8?q?=E5=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserPackageOrderServiceImpl.java     | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 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 a254d60..d023866 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
@@ -782,14 +782,18 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                 }
             }
             userPackageOrder.setVipRate(vipRate);
-            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);
-            BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
-            userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
-            totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
-            totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
+            if(vipRate.compareTo(new BigDecimal(100))==0){
+                userPackageOrder.setVipReductionMoney(BigDecimal.ZERO);//会员减免金额
+            }else {
+                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);
+                BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
+                userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
+                totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
+                totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
+            }
             userPackageOrder.setPayMoney(totalMoney);
             userPackageOrder.setCreateTime(DateUtils.format(new Date()));
             userPackageOrder.setStatus(0);
@@ -1064,15 +1068,19 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                 }
             }
             userPackageOrder.setVipRate(vipRate);
-            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);
-            BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
-            userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
-            totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
-            totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
-            userPackageOrder.setPayMoney(totalMoney);
+            if(vipRate.compareTo(new BigDecimal(100))==0){
+                userPackageOrder.setVipReductionMoney(BigDecimal.ZERO);//会员减免金额
+            }else {
+                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);
+                BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
+                userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
+                totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
+                totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
+            }
+                userPackageOrder.setPayMoney(totalMoney);
             userPackageOrder.setCreateTime(DateUtils.format(new Date()));
             userPackageOrder.setStatus(0);
             userPackageOrder.setOrdersNo(getGeneralOrder());