|
|
@@ -368,10 +368,10 @@ public class CollectionService {
|
|
|
collection.setLiked(!list.isEmpty());
|
|
|
if (collection.getType() == CollectionType.BLIND_BOX) {
|
|
|
collection.setAppointment(appointmentRepo.findFirstByBlindBoxId(collection.getId()).isPresent());
|
|
|
- Cart cart = cartRepo
|
|
|
- .findFirstByCollectionIdAndUserIdAndDel(collection.getId(), user.getId(), false);
|
|
|
- collection.setInCart(cart != null);
|
|
|
}
|
|
|
+ Cart cart = cartRepo
|
|
|
+ .findFirstByCollectionIdAndUserIdAndDel(collection.getId(), user.getId(), false);
|
|
|
+ collection.setInCart(cart != null);
|
|
|
// 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());
|