|
|
@@ -257,10 +257,10 @@ public class CollectionService {
|
|
|
if (collection.getType() == CollectionType.BLIND_BOX) {
|
|
|
collection.setAppointment(appointmentRepo.findFirstByBlindBoxId(collection.getId()).isPresent());
|
|
|
}
|
|
|
- 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() - purchase);
|
|
|
- }
|
|
|
+// 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());
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
return collection;
|