|
|
@@ -1,6 +1,5 @@
|
|
|
package com.izouma.nineth.service;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.izouma.nineth.TokenHistory;
|
|
|
import com.izouma.nineth.annotations.Debounce;
|
|
|
import com.izouma.nineth.config.GeneralProperties;
|
|
|
@@ -19,7 +18,6 @@ import com.izouma.nineth.utils.JpaUtils;
|
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.collections.MapUtils;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.RandomUtils;
|
|
|
import org.apache.commons.lang3.Range;
|
|
|
@@ -31,7 +29,6 @@ import org.springframework.core.env.Environment;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageImpl;
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
-import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
|
import org.springframework.data.redis.core.BoundValueOperations;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
@@ -40,7 +37,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
|
-import javax.persistence.criteria.Predicate;
|
|
|
import javax.transaction.Transactional;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
@@ -259,7 +255,7 @@ public class CollectionService {
|
|
|
}
|
|
|
// if (showVip && collection.getAssignment() > 0 && user.getVipPurchase() > 0) {
|
|
|
// int purchase = orderRepo.countByUserIdAndCollectionIdAndVipTrueAndStatusIn(user.getId(), collection.getId(), Arrays.asList(OrderStatus.FINISH, OrderStatus.NOT_PAID, OrderStatus.PROCESSING));
|
|
|
- collection.setVipSurplus(user.getVipPurchase());
|
|
|
+ collection.setVipSurplus(user.getVipPurchase());
|
|
|
// }
|
|
|
}
|
|
|
}
|
licailing