fix

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

@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static com.cyksj.enums.GatewayApiCode.GROUP_INDEX_ALREADY_BE_USER;
 import static com.cyksj.enums.GatewayApiCode.GROUP_INDEX_NOT_FIND;
@@ -118,7 +119,15 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.build());
 		//过滤邀请制、已失效的车位
 		DateTime now = DateTime.now();
-		list.stream().forEach(ticket -> {
+		list = list.stream().filter(e -> {
+			if (e.getExpiryTime() != null && e.getExpiryTime().before(now)) {
+				return false;
+			}
+			return true;
+		}).collect(Collectors.toList());
+		Integer size = list.size();
+
+		list.forEach(ticket -> {
 			if (ticket.getSkuId() == null || ticket.getGoodsId() == null) {
 				return;
 			}
@@ -180,7 +189,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setTransactionId(orderDon.getTransactionId());
 			}
 
-			if (list.size() > 1 && ticket.getGoodsId() != 18) {
+			if (size > 1 && ticket.getGoodsId() != 18) {
 				Date payTime = null;
 				if (orderDon != null) {
 					payTime = Optional.ofNullable(orderDon.getPayTime()).orElse(orderDon.getCreatedTime());

netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author chan
@@ -98,16 +99,23 @@ public class UserController {
         long userId = StpUserUtil.getLoginIdAsLong();
         List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, null);
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
-        Long yhsId = yhShopFrontService.getYhsIdByCustomId(customId);
-        Number ticketNum = beanSearcher.searchCount(UserTicketView.class, builder
-                .field(UserTicketView::getYhsId, yhsId)
-                .field(UserTicketView::getUserId, userIds).op(Operator.InList)
+        List<RenewalView> renewalViews = beanSearcher.searchAll(RenewalView.class, builder
+                .field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
+                .field(RenewalView::getUserId, userIds).op(Operator.InList)
                 .field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
+                .orderBy(RenewalView::getExpiryTime).asc()
+                .onlySelect(RenewalView::getExpiryTime)
                 .build());
-        UserPersonalView personalView = new UserPersonalView();
         DateTime now = DateTime.now();
+        renewalViews = renewalViews.stream().filter(e -> {
+            if (e.getExpiryTime() != null && e.getExpiryTime().before(now)) {
+                return false;
+            }
+            return true;
+        }).collect(Collectors.toList());
+        UserPersonalView personalView = new UserPersonalView();
         //车票
-        personalView.setNumOfTickets(ticketNum.intValue());
+        personalView.setNumOfTickets(renewalViews.size());
         //优惠券
         Integer couponSize = couponUserMapper.selectCount(Wrappers.lambdaQuery(CouponUser.class)
                 .eq(CouponUser::getUserId, userId)