|
|
@@ -1072,26 +1072,27 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
} else {
|
|
|
relationExpiryTime = DateUtil.offsetMonth(relationExpiryTime, -presentSku.getMonths());
|
|
|
}
|
|
|
- }
|
|
|
- Long betweenDay = DateUtil.betweenDay(now, renewExpiryTime, false) + 1;
|
|
|
- //当天购买的按规格原价抵扣
|
|
|
- BigDecimal renewDeductMoney;
|
|
|
- if (now.toDateStr().equals(DateUtil.format(renewOrderDon.getCreatedTime(), "yyyy-MM-dd"))) {
|
|
|
- renewDeductMoney = orderMoney;
|
|
|
- deductMoney = deductMoney.add(renewDeductMoney);
|
|
|
- if (presentSku.getDays() != null) {
|
|
|
- relationExpiryTime = DateUtil.offsetDay(relationExpiryTime, -presentSku.getDays());
|
|
|
+ } else {
|
|
|
+ Long betweenDay = DateUtil.betweenDay(now, renewExpiryTime, false) + 1;
|
|
|
+ //当天购买的按规格原价抵扣
|
|
|
+ BigDecimal renewDeductMoney;
|
|
|
+ if (now.toDateStr().equals(DateUtil.format(renewOrderDon.getCreatedTime(), "yyyy-MM-dd"))) {
|
|
|
+ renewDeductMoney = orderMoney;
|
|
|
+ deductMoney = deductMoney.add(renewDeductMoney);
|
|
|
+ if (presentSku.getDays() != null) {
|
|
|
+ relationExpiryTime = DateUtil.offsetDay(relationExpiryTime, -presentSku.getDays());
|
|
|
+ } else {
|
|
|
+ relationExpiryTime = DateUtil.offsetMonth(relationExpiryTime, -presentSku.getMonths());
|
|
|
+ }
|
|
|
} else {
|
|
|
- relationExpiryTime = DateUtil.offsetMonth(relationExpiryTime, -presentSku.getMonths());
|
|
|
+ //此次续费规格单价
|
|
|
+ BigDecimal single = getPayOrderSingle(orderMoney, presentSku);
|
|
|
+ //该车票抵扣金额
|
|
|
+ renewDeductMoney = single.multiply(BigDecimal.valueOf(betweenDay));
|
|
|
+ log.info("车票id:{}目前续费升级规格可抵扣的金额为:{}", relationId, renewDeductMoney);
|
|
|
+ deductMoney = deductMoney.add(renewDeductMoney);
|
|
|
+ relationExpiryTime = DateUtil.offsetDay(relationExpiryTime, -betweenDay.intValue());
|
|
|
}
|
|
|
- } else {
|
|
|
- //此次续费规格单价
|
|
|
- BigDecimal single = getPayOrderSingle(orderMoney, presentSku);
|
|
|
- //该车票抵扣金额
|
|
|
- renewDeductMoney = single.multiply(BigDecimal.valueOf(betweenDay));
|
|
|
- log.info("车票id:{}目前续费升级规格可抵扣的金额为:{}", relationId, renewDeductMoney);
|
|
|
- deductMoney = deductMoney.add(renewDeductMoney);
|
|
|
- relationExpiryTime = DateUtil.offsetDay(relationExpiryTime, -betweenDay.intValue());
|
|
|
}
|
|
|
//上一个续费升级规格
|
|
|
List<OrderDon> orderDOns = claudeCodeUserRenewExpiryRecordMapper.getOtherRenewSkuOrders(renewOrderId, relationId, userIdList);
|