yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:614bd1bf3f00e15d18f7d137c0a31db1c440ab82
Branches Tags
yangjun:master
..
compare: yangjun:996a2276b3f1b8c8f27bb60a934bc3abf9c755af
Branches Tags
yangjun:master

No commits in common. "614bd1bf3f00e15d18f7d137c0a31db1c440ab82" and "996a2276b3f1b8c8f27bb60a934bc3abf9c755af" have entirely different histories.
614bd1bf3f ... 996a2276b3

1 changed files with 20 additions and 26 deletions
Show Stats Expand all files Collapse all files

46
src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
View File

@ -271,7 +271,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
BigDecimal vipMoney = canVipMoney; BigDecimal vipMoney = canVipMoney;
BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额 BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠 canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
canVipMoney = canVipMoney.setScale(2, BigDecimal.ROUND_HALF_UP); canVipMoney = canVipMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney); BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额 userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额 totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
@ -406,7 +406,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
BigDecimal vipMoney = canVipMoney; BigDecimal vipMoney = canVipMoney;
BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额 BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠 canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
canVipMoney = canVipMoney.setScale(2,BigDecimal.ROUND_HALF_UP); canVipMoney = canVipMoney.setScale(0,BigDecimal.ROUND_HALF_UP);
BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney); BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额 userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额 totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
@ -713,6 +713,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
for (UserPackageOrdersMapping ordersPackage : ordersPackageList) { for (UserPackageOrdersMapping ordersPackage : ordersPackageList) {
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId()); MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
BigDecimal sum = massagePackage.getPrice().multiply(new BigDecimal(ordersPackage.getNum())); BigDecimal sum = massagePackage.getPrice().multiply(new BigDecimal(ordersPackage.getNum()));
sum = sum.setScale(0,BigDecimal.ROUND_HALF_UP);
if(massagePackage.getIsCanCoupon() == 1){ if(massagePackage.getIsCanCoupon() == 1){
canCouponMoney = canCouponMoney.add(sum); canCouponMoney = canCouponMoney.add(sum);
} }
@ -781,18 +782,14 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
} }
} }
userPackageOrder.setVipRate(vipRate); userPackageOrder.setVipRate(vipRate);
if(vipRate.compareTo(new BigDecimal(100))==0){ BigDecimal vipMoney = canVipMoney;
userPackageOrder.setVipReductionMoney(BigDecimal.ZERO);//会员减免金额 BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
}else { canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
BigDecimal vipMoney = canVipMoney; canVipMoney = canVipMoney.setScale(0,BigDecimal.ROUND_HALF_UP);
BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额 BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠 userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
canVipMoney = canVipMoney.setScale(2, BigDecimal.ROUND_HALF_UP); totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney); totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
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.setCreateTime(DateUtils.format(new Date()));
userPackageOrder.setStatus(0); userPackageOrder.setStatus(0);
@ -999,6 +996,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
for (UserPackageOrdersMapping ordersPackage : ordersPackageList) { for (UserPackageOrdersMapping ordersPackage : ordersPackageList) {
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId()); MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
BigDecimal sum = massagePackage.getPrice().multiply(new BigDecimal(ordersPackage.getNum())); BigDecimal sum = massagePackage.getPrice().multiply(new BigDecimal(ordersPackage.getNum()));
sum = sum.setScale(0,BigDecimal.ROUND_HALF_UP);
if(massagePackage.getIsCanCoupon() == 1){ if(massagePackage.getIsCanCoupon() == 1){
canCouponMoney = canCouponMoney.add(sum); canCouponMoney = canCouponMoney.add(sum);
} }
@ -1066,18 +1064,14 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
} }
} }
userPackageOrder.setVipRate(vipRate); userPackageOrder.setVipRate(vipRate);
if(vipRate.compareTo(new BigDecimal(100))==0){ BigDecimal vipMoney = canVipMoney;
userPackageOrder.setVipReductionMoney(BigDecimal.ZERO);//会员减免金额 BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额
}else { canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠
BigDecimal vipMoney = canVipMoney; canVipMoney = canVipMoney.setScale(0,BigDecimal.ROUND_HALF_UP);
BigDecimal unCanVipMoney = totalMoney.subtract(canVipMoney);//非会员优惠金额 BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney);
canVipMoney = canVipMoney.multiply(userPackageOrder.getVipRate()).divide(new BigDecimal(100));//对可用vip的金额进行优惠 userPackageOrder.setVipReductionMoney(vipReductionMoney);//会员减免金额
canVipMoney = canVipMoney.setScale(2, BigDecimal.ROUND_HALF_UP); totalMoney = canVipMoney.add(unCanVipMoney);//优惠后的总金额
BigDecimal vipReductionMoney = vipMoney.subtract(canVipMoney); totalMoney = totalMoney.subtract(userPackageOrder.getCouponMoney());//减去优惠券额度后的总金额
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.setCreateTime(DateUtils.format(new Date()));
userPackageOrder.setStatus(0); userPackageOrder.setStatus(0);