|
|
@@ -360,6 +360,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
|
|
|
private final ClaudeUserMapper claudeUserMapper;
|
|
|
|
|
|
+ private final MirrorExpiryRenewOrderRelateMapper mirrorExpiryRenewOrderRelateMapper;
|
|
|
+
|
|
|
private final List<String> noChekGoodsTemp = List.of("Apple One", "Youtube", "Spotify");
|
|
|
|
|
|
@Transactional(rollbackFor = Throwable.class)
|
|
|
@@ -1218,6 +1220,12 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
closeOrder(orderId, null);
|
|
|
});
|
|
|
}
|
|
|
+ //记录镜像过期车票 续费订单关联
|
|
|
+ if (relation.getExpiryTime() != null && relation.getExpiryTime().compareTo(DateTime.now()) <= 0) {
|
|
|
+ MirrorExpiryRenewOrderRelate mirrorExpiryRenewOrderRelate = new MirrorExpiryRenewOrderRelate();
|
|
|
+ mirrorExpiryRenewOrderRelate.setOrderId(orderId);
|
|
|
+ mirrorExpiryRenewOrderRelateMapper.insert(mirrorExpiryRenewOrderRelate);
|
|
|
+ }
|
|
|
return orderDon;
|
|
|
}
|
|
|
|
|
|
@@ -1655,7 +1663,12 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
skuNewExpiryTime = DateUtil.offset(DateTime.now(), DateField.MONTH, donSku.getMonths() * order.getNum());
|
|
|
}
|
|
|
}
|
|
|
- relation.setExpiryTime(newDate);
|
|
|
+ //若车票已过期 镜像车票续费
|
|
|
+ if (sku.getIsMirror() && relation.getExpiryTime().compareTo(DateTime.now()) <= 0) {
|
|
|
+ relation.setExpiryTime(skuNewExpiryTime);
|
|
|
+ } else {
|
|
|
+ relation.setExpiryTime(newDate);
|
|
|
+ }
|
|
|
relation.setStartTime(relation.getStartTime() == null ? new Date() : null);
|
|
|
|
|
|
//镜像续费升级
|
|
|
@@ -4143,6 +4156,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
//记录用户镜像店铺订单
|
|
|
recordUserMirrorShopOrderRelate(orderDon.getId(), payRequest.getUserId(), payRequest.getCmt(), payRequest.getCustomId());
|
|
|
+
|
|
|
+ //记录镜像过期车票 续费订单关联
|
|
|
+ if (groupsRelation.getExpiryTime() != null && groupsRelation.getExpiryTime().compareTo(DateTime.now()) <= 0) {
|
|
|
+ MirrorExpiryRenewOrderRelate mirrorExpiryRenewOrderRelate = new MirrorExpiryRenewOrderRelate();
|
|
|
+ mirrorExpiryRenewOrderRelate.setOrderId(orderId);
|
|
|
+ mirrorExpiryRenewOrderRelateMapper.insert(mirrorExpiryRenewOrderRelate);
|
|
|
+ }
|
|
|
return orderDon;
|
|
|
}
|
|
|
|