|
@@ -81,7 +81,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true).build()));
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true).build()));
|
|
|
ticket.setGoodsDonViews(views);
|
|
ticket.setGoodsDonViews(views);
|
|
|
}
|
|
}
|
|
|
- if (ticket.getExpiryTime() != null && ticket.getGoodsType() == 1 && ticket.getSecondType() == 2 && ticket.getMonths() < 300) {
|
|
|
|
|
|
|
+ if (ticket.getMonths() != null && ticket.getMonths() >= 300) {
|
|
|
|
|
+ ticket.setExpiryTime(null);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (ticket.getExpiryTime() != null && ticket.getGoodsType() == 1 && ticket.getSecondType() == 2) {
|
|
|
String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime(), BetweenFormater.Level.DAY);
|
|
String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime(), BetweenFormater.Level.DAY);
|
|
|
ticket.setRemainDays(remainDays);
|
|
ticket.setRemainDays(remainDays);
|
|
|
}
|
|
}
|