zoujiajian 2 жил өмнө
parent
commit
d4f58a8cf2

+ 5 - 0
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -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(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
 				.orderBy(RenewalView::getExpiryTime).asc()
+				.onlySelect(RenewalView::getRelationId, RenewalView::getAccount, RenewalView::getGoodsId, RenewalView::getTitle, RenewalView::getLogo, RenewalView::getImg, RenewalView::getGroupId, RenewalView::getSkuId, RenewalView::getSpecVal)
 				.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());
@@ -641,6 +642,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		//提前7天
 		AtomicInteger day = new AtomicInteger(7);
 		List<RenewalView> expiryTickets = list.getDataList().stream().filter(ticket -> {
+			//下架
+			if (!ticket.getGoodsStatus() || !ticket.getSkuStatus()) {
+				return false;
+			}
 			Long skuNum = ticket.getSkuNum();
 			Date expiryTime = ticket.getExpiryTime();
 			//年付 提前一个月