fix

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -611,9 +611,4 @@ public interface Constant {
 	 * 提现默认支付宝
 	 */
 	String TAKE_MONEY_DEFAULT_ZFB = "take_money_default_zfb";
-
-	/**
-	 * 批发车票类型
-	 */
-	Integer WHOLESALE_TICKET_TYPE = 4;
 }

netflix-dao/src/main/java/com/cyksj/model/entity/ExchangeCode.java

@@ -47,7 +47,7 @@ public class ExchangeCode extends BaseEntity{
 	private Long userId;
 
 	/**
-	 * 0平台 1抽奖
+	 * 0平台 1抽奖 2.个人网站
 	 */
 	private Integer type;
 

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

@@ -1299,7 +1299,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		Number number = beanSearcher.searchCount(RenewalView.class, MapUtils.builder()
 				.field(RenewalView::getUserId, userIdList).op(Operator.InList)
 				.field(RenewalView::getStatus, GroupsRelation.Status.validity.name())
-				.field(RenewalView::getAqType, Constant.WHOLESALE_TICKET_TYPE).op(Operator.NotEqual)
 				.field(RenewalView::getIsMirror, true)
 				.build());
 		if (number.intValue() == 0) {
@@ -1616,7 +1615,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 						.field(RenewalView::getRelationId, ticket.getRelationId()).op(Operator.NotEqual)
 						.field(RenewalView::getSkuId, skuId)
 						.field(RenewalView::getUserId, userIds).op(Operator.InList)
-						.field(RenewalView::getAqType, Constant.WHOLESALE_TICKET_TYPE).op(Operator.NotEqual)
 						.field(RenewalView::getExpiryTime, ticket.getExpiryTime()).op(Operator.GreaterThan)
 						.build());
 				if (number.intValue() == 0) {

netflix-service/src/main/java/com/cyksj/service/vip/impl/VipFrontServiceImpl.java

@@ -13,7 +13,6 @@ import com.cyksj.model.dto.VipDeductDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.response.VipUserPageResp;
-import com.cyksj.model.views.RenewalView;
 import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.service.vip.VipFrontService;
 import com.ejlchina.searcher.BeanSearcher;
@@ -126,7 +125,6 @@ public class VipFrontServiceImpl implements VipFrontService {
 				.field(GroupsRelationView::getUserId, userIdList).op(Operator.InList)
 				.field(GroupsRelationView::getIsVip, false)
 				.field(GroupsRelationView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
-				.field(RenewalView::getAqType, Constant.WHOLESALE_TICKET_TYPE).op(Operator.NotEqual)
 				.orderBy(GroupsRelationView::getExpiryTime).desc()
 				.build());
 		Set<Long> deductSkuIds = null;

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

@@ -6,7 +6,6 @@ import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.NoSubmit;
-import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
@@ -163,7 +162,6 @@ public class UserController {
                 .field(RenewalView::getUserId, userIdList).op(Operator.InList)
                 .field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
                 .field(RenewalView::getIsVip, false)
-                .field(RenewalView::getAqType, Constant.WHOLESALE_TICKET_TYPE).op(Operator.NotEqual)
                 .orderBy(RenewalView::getExpiryTime).asc()
                 .onlySelect(RenewalView::getExpiryTime)
                 .build());