|
|
@@ -168,9 +168,8 @@ public class VipFrontServiceImpl implements VipFrontService {
|
|
|
//一个月当30天算单价 往上取整
|
|
|
//续费规格
|
|
|
if (renewSkuId != null) {
|
|
|
- OrderDon orderDon = orderDonMapper.selectById(renewOrderId);
|
|
|
GoodsDonSku sku = skuMapper.selectById(renewSkuId);
|
|
|
- BigDecimal single = orderDon.getMoney().add(orderDon.getBalance()).divide(BigDecimal.valueOf(sku.getMonths()).multiply(BigDecimal.valueOf(30)), 0, RoundingMode.UP);
|
|
|
+ BigDecimal single = sku.getPrice().divide(BigDecimal.valueOf(sku.getMonths()).multiply(BigDecimal.valueOf(30)), 0, RoundingMode.UP);
|
|
|
Long betweenDay = DateUtil.betweenDay(now, renewExpiryTime, false) + 1;
|
|
|
//该车票抵扣金额
|
|
|
BigDecimal renewDeductMoney = single.multiply(BigDecimal.valueOf(betweenDay));
|
|
|
@@ -182,7 +181,7 @@ public class VipFrontServiceImpl implements VipFrontService {
|
|
|
for (OrderDon orderDOn : orderDOns) {
|
|
|
Long skuId = orderDOn.getSkuId();
|
|
|
sku = skuMapper.selectById(skuId);
|
|
|
- BigDecimal upDeductMoney = orderDOn.getMoney().add(orderDOn.getBalance());
|
|
|
+ BigDecimal upDeductMoney = sku.getPrice();
|
|
|
log.info("车票id:{}目前次一级规格:{}可抵扣的金额为:{}", relationId, sku.getSpecVal(), upDeductMoney);
|
|
|
deductMoney = deductMoney.add(upDeductMoney);
|
|
|
if (sku.getDays() != null) {
|