|
|
@@ -80,9 +80,13 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
GoodsDonViews views = beanSearcher.searchFirst(GoodsDonViews.class, MapUtils.builder().field(GoodsDonViews::getId, ticket.getGoodsId()).build());
|
|
|
views.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getGoodsId, views.getId()).build()));
|
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true).build()));
|
|
|
-
|
|
|
ticket.setGoodsDonViews(views);
|
|
|
}
|
|
|
+ if (ticket.getGoodsType() == 1 && ticket.getSecondType() == 2 && ticket.getMonths() < 300 && ticket.getExpiryTime() != null) {
|
|
|
+ String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime());
|
|
|
+
|
|
|
+ ticket.setRemainDays();
|
|
|
+ }
|
|
|
return true;
|
|
|
}).collect(Collectors.toList());
|
|
|
return collect;
|