|
@@ -165,13 +165,14 @@ public class UserController {
|
|
|
.onlySelect(RenewalView::getExpiryTime)
|
|
.onlySelect(RenewalView::getExpiryTime)
|
|
|
.build());
|
|
.build());
|
|
|
DateTime now = DateTime.now();
|
|
DateTime now = DateTime.now();
|
|
|
|
|
+ UserPersonalView personalView = new UserPersonalView();
|
|
|
|
|
+ personalView.setTotalOfTickets(renewalViews.size());
|
|
|
renewalViews = renewalViews.stream().filter(e -> {
|
|
renewalViews = renewalViews.stream().filter(e -> {
|
|
|
if (e.getExpiryTime() != null && e.getExpiryTime().before(now)) {
|
|
if (e.getExpiryTime() != null && e.getExpiryTime().before(now)) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
- UserPersonalView personalView = new UserPersonalView();
|
|
|
|
|
//车票
|
|
//车票
|
|
|
personalView.setNumOfTickets(renewalViews.size());
|
|
personalView.setNumOfTickets(renewalViews.size());
|
|
|
//优惠券
|
|
//优惠券
|