|
@@ -1452,22 +1452,26 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
Date expiryTime = Optional.ofNullable(relation.getExpiryTime()).orElse(new Date());
|
|
Date expiryTime = Optional.ofNullable(relation.getExpiryTime()).orElse(new Date());
|
|
|
GoodsDonSku donSku = goodsDonSkuMapper.selectById(order.getSkuId());
|
|
GoodsDonSku donSku = goodsDonSkuMapper.selectById(order.getSkuId());
|
|
|
Date newDate;
|
|
Date newDate;
|
|
|
|
|
+ Date skuNewExpiryTime;
|
|
|
//天数、月份
|
|
//天数、月份
|
|
|
if (donSku.getDays() != null && donSku.getDays() > 0) {
|
|
if (donSku.getDays() != null && donSku.getDays() > 0) {
|
|
|
newDate = DateUtil.offsetDay(expiryTime, donSku.getDays() * order.getNum());
|
|
newDate = DateUtil.offsetDay(expiryTime, donSku.getDays() * order.getNum());
|
|
|
|
|
+ skuNewExpiryTime = DateUtil.offsetDay(DateTime.now(), donSku.getDays() * order.getNum());
|
|
|
} else {
|
|
} else {
|
|
|
//奈飞月付 按30天计算
|
|
//奈飞月付 按30天计算
|
|
|
if (sku.getId() == 4) {
|
|
if (sku.getId() == 4) {
|
|
|
newDate = DateUtil.offsetDay(expiryTime, 30 * order.getNum());
|
|
newDate = DateUtil.offsetDay(expiryTime, 30 * order.getNum());
|
|
|
|
|
+ skuNewExpiryTime = DateUtil.offsetDay(DateTime.now(), 30 * order.getNum());
|
|
|
} else {
|
|
} else {
|
|
|
newDate = DateUtil.offset(expiryTime, DateField.MONTH, donSku.getMonths() * order.getNum());
|
|
newDate = DateUtil.offset(expiryTime, DateField.MONTH, donSku.getMonths() * order.getNum());
|
|
|
|
|
+ skuNewExpiryTime = DateUtil.offset(DateTime.now(), DateField.MONTH, donSku.getMonths() * order.getNum());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
relation.setExpiryTime(newDate);
|
|
relation.setExpiryTime(newDate);
|
|
|
relation.setStartTime(relation.getStartTime() == null ? new Date() : null);
|
|
relation.setStartTime(relation.getStartTime() == null ? new Date() : null);
|
|
|
|
|
|
|
|
//镜像续费升级
|
|
//镜像续费升级
|
|
|
- handleMirrorRenew(sku, order, groupsTrips, relation.getId(), newDate);
|
|
|
|
|
|
|
+ handleMirrorRenew(sku, order, groupsTrips, relation.getId(), skuNewExpiryTime);
|
|
|
} else if (GroupsTrips.Status.waiting.equals(groupsTrips.getStatus())) {
|
|
} else if (GroupsTrips.Status.waiting.equals(groupsTrips.getStatus())) {
|
|
|
log.info("车位groupsId:{}未发车,修改订单号orderNo:{}订单为已付款状态:{}", groupsTrips.getId(), order.getOrderNo());
|
|
log.info("车位groupsId:{}未发车,修改订单号orderNo:{}订单为已付款状态:{}", groupsTrips.getId(), order.getOrderNo());
|
|
|
order.setStatus(OrderDon.Status.hasPayment);
|
|
order.setStatus(OrderDon.Status.hasPayment);
|
|
@@ -3792,9 +3796,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
.eq(OrderDonRenewRecord::getOrderId, order.getId())
|
|
.eq(OrderDonRenewRecord::getOrderId, order.getId())
|
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
|
if (orderDonRenewRecord != null) {
|
|
if (orderDonRenewRecord != null) {
|
|
|
- orderDonRenewRecordMapper.updateById(orderDonRenewRecord);
|
|
|
|
|
//同规格续费无需更新
|
|
//同规格续费无需更新
|
|
|
if (!ObjectUtil.equal(groupsTrips.getSkuId(), order.getSkuId())) {
|
|
if (!ObjectUtil.equal(groupsTrips.getSkuId(), order.getSkuId())) {
|
|
|
|
|
+ log.info("用户续费升级订单skuId:{}将用户车票relationId:{}套餐续费升级", order.getSkuId(), relationId);
|
|
|
//升级gptUser次数
|
|
//升级gptUser次数
|
|
|
ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
|
|
ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
|
|
|
.eq(ChatgptUser::getRelationId, relationId)
|
|
.eq(ChatgptUser::getRelationId, relationId)
|