fix

netflix-service/src/main/java/com/cyksj/service/relation/GroupRelationFrontService.java

@@ -20,7 +20,7 @@ import java.util.List;
  *创建时间:2022/12/29 15:42
  */
 public interface GroupRelationFrontService {
-	SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt);
+	SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt, Boolean isVip);
 
 	Boolean isJoinCorpWx(Long userId, Boolean isJoin, Boolean noCoupon);
 

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

@@ -179,7 +179,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	private final VipGoodsSkuMapper vipGoodsSkuMapper;
 
 	@Override
-	public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt) {
+	public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt, Boolean isVip) {
 		User u = userMapper.selectById(userId);
 		if (u == null) throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
 		if (u.getIsBlack()) {
@@ -218,6 +218,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.field(RenewalView::getUserId, userIds).op(Operator.InList)
 				.put("condition", conditionSql)
 				.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
+				.field(RenewalView::getIsVip, Optional.ofNullable(isVip).orElse(false))
 				.orderBy(RenewalView::getExpiryTime).asc()
 				.build());
 		if (list.getDataList().size() > 0) {
@@ -380,7 +381,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				}
 
 				if (CollUtil.isNotEmpty(gptBuyGids) && gptBuyGids.contains(ticket.getGoodsId())) {
-					if (gptMirrorDayCardGiveawayActivity != null && orderDon!=null && orderDon.getCreatedTime().compareTo(gptMirrorDayCardGiveawayActivity.getCreatedTime()) > 0) {
+					if (gptMirrorDayCardGiveawayActivity != null && orderDon != null && orderDon.getCreatedTime().compareTo(gptMirrorDayCardGiveawayActivity.getCreatedTime()) > 0) {
 						//是否领取过GPT日卡
 						Long orderId = orderDon.getId();
 						Number count = beanSearcher.searchCount(GptMirrorDayCardActivityRecord.class, MapUtils.builder().field(GptMirrorDayCardActivityRecord::getOrderId, orderId).build());

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -143,9 +143,9 @@ public class GroupRelationController {
     private final static Sequence SEQUENCE = new Sequence(0);
 
     @RequestMapping("/get/renewal")
-    public Result<SearchResult<RenewalView>> get(Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt) {
+    public Result<SearchResult<RenewalView>> get(Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt, Boolean isVip) {
         long userId = StpUserUtil.getLoginIdAsLong();
-        SearchResult<RenewalView> list = groupRelationFrontService.getMyTicket(userId, isLoginPopularize, customId, account, orderNo, cmt);
+        SearchResult<RenewalView> list = groupRelationFrontService.getMyTicket(userId, isLoginPopularize, customId, account, orderNo, cmt, isVip);
         return GatewayResponse.SUCCESS.newBuilder().toResult(list);
     }