|
@@ -633,6 +633,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
.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))
|
|
|
.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
|
|
.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
|
|
|
.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)
|
|
|
.build());
|
|
.build());
|
|
|
if (list.getDataList().size() > 5) {
|
|
if (list.getDataList().size() > 5) {
|
|
|
redisService.setNx(RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getNameFormat(thisDate, userId), userId, RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getTimeout());
|
|
redisService.setNx(RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getNameFormat(thisDate, userId), userId, RedisService.key.TICKET_EXPIRY_NOTIFY_DAY.getTimeout());
|
|
@@ -641,6 +642,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
//提前7天
|
|
//提前7天
|
|
|
AtomicInteger day = new AtomicInteger(7);
|
|
AtomicInteger day = new AtomicInteger(7);
|
|
|
List<RenewalView> expiryTickets = list.getDataList().stream().filter(ticket -> {
|
|
List<RenewalView> expiryTickets = list.getDataList().stream().filter(ticket -> {
|
|
|
|
|
+ //下架
|
|
|
|
|
+ if (!ticket.getGoodsStatus() || !ticket.getSkuStatus()) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
Long skuNum = ticket.getSkuNum();
|
|
Long skuNum = ticket.getSkuNum();
|
|
|
Date expiryTime = ticket.getExpiryTime();
|
|
Date expiryTime = ticket.getExpiryTime();
|
|
|
//年付 提前一个月
|
|
//年付 提前一个月
|