|
@@ -2534,7 +2534,12 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
Date expiryTime = relationView.getExpiryTime();
|
|
Date expiryTime = relationView.getExpiryTime();
|
|
|
DateTime now = DateTime.now();
|
|
DateTime now = DateTime.now();
|
|
|
if (relationView.getIsFrozen()) {
|
|
if (relationView.getIsFrozen()) {
|
|
|
- expiryTime = DateUtil.offsetDay(now, relationView.getReservedDays());
|
|
|
|
|
|
|
+ Integer reservedDays = relationView.getReservedDays();
|
|
|
|
|
+ //处理边界
|
|
|
|
|
+ if (relationView.getReservedDays() == 365) {
|
|
|
|
|
+ reservedDays = 364;
|
|
|
|
|
+ }
|
|
|
|
|
+ expiryTime = DateUtil.offsetDay(now, reservedDays);
|
|
|
}
|
|
}
|
|
|
if (expiryTime == null) {
|
|
if (expiryTime == null) {
|
|
|
if (sku.getDays() != null) {
|
|
if (sku.getDays() != null) {
|