|
|
@@ -125,17 +125,17 @@ public class VipFrontServiceImpl implements VipFrontService {
|
|
|
ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class).eq(ChatgptUser::getRelationId, relationId).last("limit 1"));
|
|
|
if (chatgptUser != null) {
|
|
|
//获取抵扣金额
|
|
|
- deductMoney.add(getFinalDeductMoney(relationId, relation.getSkuId(), chatgptUser.getRenewSkuId(), chatgptUser.getRenewOrderId(), chatgptUser.getRenewExpiryTime(), relationExpiryTime, now, userIdList));
|
|
|
+ deductMoney = deductMoney.add(getFinalDeductMoney(relationId, relation.getSkuId(), chatgptUser.getRenewSkuId(), chatgptUser.getRenewOrderId(), chatgptUser.getRenewExpiryTime(), relationExpiryTime, now, userIdList));
|
|
|
}
|
|
|
} else if (goodsId == Constant.CLAUDE_PRO_GID) {
|
|
|
ClaudeUser claudeUser = claudeUserMapper.selectOne(Wrappers.lambdaQuery(ClaudeUser.class).eq(ClaudeUser::getRelationId, relationId).last("limit 1"));
|
|
|
if (claudeUser != null) {
|
|
|
//获取抵扣金额
|
|
|
- deductMoney.add(getFinalDeductMoney(relationId, relation.getSkuId(), claudeUser.getRenewSkuId(), claudeUser.getRenewOrderId(), claudeUser.getRenewExpiryTime(), relationExpiryTime, now, userIdList));
|
|
|
+ deductMoney = deductMoney.add(getFinalDeductMoney(relationId, relation.getSkuId(), claudeUser.getRenewSkuId(), claudeUser.getRenewOrderId(), claudeUser.getRenewExpiryTime(), relationExpiryTime, now, userIdList));
|
|
|
}
|
|
|
} else {
|
|
|
//该车票抵扣金额
|
|
|
- deductMoney.add(getDeductMoneyFromTicket(vipSkuId, now, relationExpiryTime));
|
|
|
+ deductMoney = deductMoney.add(getDeductMoneyFromTicket(vipSkuId, now, relationExpiryTime));
|
|
|
}
|
|
|
deductRelationIds.add(relationId);
|
|
|
//超出可抵扣的金额 直接返回
|
|
|
@@ -164,7 +164,7 @@ public class VipFrontServiceImpl implements VipFrontService {
|
|
|
//该车票抵扣金额
|
|
|
BigDecimal renewDeductMoney = single.multiply(BigDecimal.valueOf(betweenDay));
|
|
|
log.info("车票id:{}目前续费升级规格可抵扣的金额为:{}", relationId, renewDeductMoney);
|
|
|
- deductMoney.add(renewDeductMoney);
|
|
|
+ deductMoney = deductMoney.add(renewDeductMoney);
|
|
|
relationExpiryTime = DateUtil.offsetDay(relationExpiryTime, betweenDay.intValue());
|
|
|
//上一个续费升级规格
|
|
|
List<OrderDon> orderDOns = orderDonRenewRecordMapper.getOtherRenewSkus(renewOrderId, relationId, userIdList);
|
|
|
@@ -173,7 +173,7 @@ public class VipFrontServiceImpl implements VipFrontService {
|
|
|
sku = skuMapper.selectById(skuId);
|
|
|
BigDecimal upDeductMoney = orderDOn.getMoney().add(orderDOn.getBalance());
|
|
|
log.info("车票id:{}目前次一级规格:{}可抵扣的金额为:{}", relationId, sku.getSpecVal(), upDeductMoney);
|
|
|
- deductMoney.add(upDeductMoney);
|
|
|
+ deductMoney = deductMoney.add(upDeductMoney);
|
|
|
if (sku.getDays() != null) {
|
|
|
relationExpiryTime = DateUtil.offsetDay(relationExpiryTime, -sku.getDays());
|
|
|
} else {
|
|
|
@@ -185,7 +185,7 @@ public class VipFrontServiceImpl implements VipFrontService {
|
|
|
//该车票抵扣金额
|
|
|
BigDecimal deductMoneyFromTicket = getDeductMoneyFromTicket(relationSkuId, now, relationExpiryTime);
|
|
|
log.info("车票id:{}最终到期时间为:{}车票可返回 抵扣金额:{}", relationId, relationExpiryTime, deductMoney);
|
|
|
- deductMoney.add(deductMoneyFromTicket);
|
|
|
+ deductMoney = deductMoney.add(deductMoneyFromTicket);
|
|
|
}
|
|
|
return deductMoney;
|
|
|
}
|