|
@@ -627,7 +627,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
}
|
|
}
|
|
|
List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, u);
|
|
List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, u);
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
- SearchResult<RenewalView> list = beanSearcher.search(RenewalView.class, builder
|
|
|
|
|
|
|
+ List<RenewalView> list = beanSearcher.searchAll(RenewalView.class, builder
|
|
|
.field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
|
|
.field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
|
|
|
.field(RenewalView::getUserId, userIds).op(Operator.InList)
|
|
.field(RenewalView::getUserId, userIds).op(Operator.InList)
|
|
|
.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", now))
|
|
.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", now))
|
|
@@ -635,13 +635,13 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
.orderBy(RenewalView::getExpiryTime).asc()
|
|
.orderBy(RenewalView::getExpiryTime).asc()
|
|
|
.onlySelect(RenewalView::getRelationId, RenewalView::getAccount, RenewalView::getGoodsId, RenewalView::getTitle, RenewalView::getLogo, RenewalView::getImg, RenewalView::getGroupId, RenewalView::getSkuId, RenewalView::getSpecVal)
|
|
.onlySelect(RenewalView::getRelationId, RenewalView::getAccount, RenewalView::getGoodsId, RenewalView::getTitle, RenewalView::getLogo, RenewalView::getImg, RenewalView::getGroupId, RenewalView::getSkuId, RenewalView::getSpecVal)
|
|
|
.build());
|
|
.build());
|
|
|
- if (list.getDataList().size() > 5) {
|
|
|
|
|
-// redisService.setNx(RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getNameFormat(thisDate, userId), userId, RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getTimeout());
|
|
|
|
|
- return null;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (list.size() > 5) {
|
|
|
|
|
+//// redisService.setNx(RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getNameFormat(thisDate, userId), userId, RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getTimeout());
|
|
|
|
|
+// return null;
|
|
|
|
|
+// }
|
|
|
//提前7天
|
|
//提前7天
|
|
|
AtomicInteger day = new AtomicInteger(7);
|
|
AtomicInteger day = new AtomicInteger(7);
|
|
|
- List<RenewalView> expiryTickets = list.getDataList().stream().filter(ticket -> {
|
|
|
|
|
|
|
+ List<RenewalView> expiryTickets = list.stream().filter(ticket -> {
|
|
|
//下架
|
|
//下架
|
|
|
if (!ticket.getGoodsStatus() || !ticket.getSkuStatus()) {
|
|
if (!ticket.getGoodsStatus() || !ticket.getSkuStatus()) {
|
|
|
return false;
|
|
return false;
|