fix

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

@@ -984,13 +984,16 @@ public class GroupRelationController {
         if (data == null) {
             return GatewayResponse.SUCCESS.newBuilder().toResult();
         }
-        GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
-                .eq(GroupsRelation::getId, relationId)
-                .in(GroupsRelation::getUserId, userIdList));
-        if (relation == null) {
-            throw BusinessRuntimeException.getInstance("车票不存在");
+        Date startTime = null;
+        if (relationId != null) {
+            GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
+                    .eq(GroupsRelation::getId, relationId)
+                    .in(GroupsRelation::getUserId, userIdList));
+            if (relation == null) {
+                throw BusinessRuntimeException.getInstance("车票不存在");
+            }
         }
-        Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null, relation.getStartTime());
+        Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null, startTime);
         data.setRenewCount(renewCount);
         return GatewayResponse.SUCCESS.newBuilder().toResult(data);
     }

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

@@ -165,15 +165,7 @@ public class UserBenefitsFrontController {
 						.field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
 						.build());
 				fhCount = tickets.intValue();
-				Date startTime = null;
-				if (relationId != null) {
-					GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
-							.eq(GroupsRelation::getId, relationId)
-							.in(GroupsRelation::getUserId, userIdList));
-					startTime = relation.getStartTime();
-				}
-
-				Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null, startTime);
+				Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null, null);
 				data.setRenewCount(renewCount);
 			}
 			if (type == UserBenefits.Type.CERT) {
@@ -233,4 +225,20 @@ public class UserBenefitsFrontController {
 			data.setIsFh(fhCount > 0);
 		}
 	}
+
+	/**
+	 * 续费权益 车票续费次数
+	 */
+	@GetMapping("/get/renew/num")
+	public Result<Integer> getRenewNum(Long relationId) {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		RenewalView renewalViews = beanSearcher.searchFirst(RenewalView.class, MapUtils.builder()
+				.field(RenewalView::getRelationId, relationId)
+				.field(RenewalView::getUserId, userIdList).op(Operator.InList)
+				.field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
+				.build());
+		Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, UserBenefits.Type.RENEW, renewalViews.getGoodsId(), renewalViews.getSkuId(), Constant.noOrderAllStatus, null, renewalViews.getStartTime());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(renewCount);
+	}
 }