Compare commits
2 Commits
996a2276b3
...
614bd1bf3f
Author | SHA1 | Date |
---|---|---|
|
614bd1bf3f | |
|
acbfa87dbe |
|
@ -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);
|
||||
}
|
||||
|
@ -782,14 +781,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(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.setCreateTime(DateUtils.format(new Date()));
|
||||
userPackageOrder.setStatus(0);
|
||||
|
@ -996,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);
|
||||
}
|
||||
|
@ -1064,14 +1066,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(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.setCreateTime(DateUtils.format(new Date()));
|
||||
userPackageOrder.setStatus(0);
|
||||
|
|
Loading…
Reference in New Issue