藏品展示列表根据新老用户显示不同数据

src/main/java/com/izouma/awesomeAdmin/service/ProductService.java

@@ -26,6 +26,7 @@ import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -95,7 +96,7 @@ public class ProductService {
         return product;
     }
 
-    public Page<Product> list(String search, Long batchId, List<ProductStatus> statuses, Pageable pageable) {
+    public Page<Product> list(String search, Long batchId, List<ProductStatus> statuses, Pageable pageable, Long userId) {
         SaleBatch saleBatch = saleBatchRepo.findById(batchId).orElseThrow(new BusinessException("分类不存在"));
         LocalTime now = LocalTime.now();
         if (!saleBatch.getEnabled()
@@ -107,6 +108,7 @@ public class ProductService {
             statuses = Collections.singletonList(ProductStatus.IN_STOCK);
         }
         boolean hideSelfProduct = sysConfigService.getBoolean("hide_self_product");
+
         List<ProductStatus> finalStatuses = statuses;
         return productRepo.findAll((Specification<Product>) (root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> predicates = new ArrayList<>();
@@ -128,6 +130,18 @@ public class ProductService {
                 ));
             }
 
+            if (userId != null) {
+                User user = userRepo.findById(userId).orElseThrow(new BusinessException(Translator.toLocale("user.not_found")));
+                BigDecimal period = sysConfigService.getBigDecimal("freshness_period _for_new");
+                if (new BigDecimal(ChronoUnit.DAYS.between(user.getCreatedAt(), LocalDateTime.now())).compareTo(period) < 1) {
+                    BigDecimal newUserMax = sysConfigService.getBigDecimal("new_user_max");
+                    predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get("currentPrice"), newUserMax));
+                } else {
+                    BigDecimal oldUserMin = sysConfigService.getBigDecimal("old_user_min");
+                    predicates.add(criteriaBuilder.greaterThanOrEqualTo(root.get("currentPrice"), oldUserMin));
+                }
+            }
+
             return criteriaQuery.where(predicates.toArray(new Predicate[0]))
                                 .getRestriction();
         }, pageable);

src/main/java/com/izouma/awesomeAdmin/web/ProductController.java

@@ -7,6 +7,7 @@ import com.izouma.awesomeAdmin.dto.PageQuery;
 import com.izouma.awesomeAdmin.exception.BusinessException;
 import com.izouma.awesomeAdmin.repo.ProductRepo;
 import com.izouma.awesomeAdmin.utils.ObjUtils;
+import com.izouma.awesomeAdmin.utils.SecurityUtils;
 import com.izouma.awesomeAdmin.utils.Translator;
 import com.izouma.awesomeAdmin.utils.excel.ExcelUtils;
 import io.swagger.annotations.*;
@@ -88,7 +89,7 @@ public class ProductController extends BaseController {
         if (StringUtils.isNotEmpty(statuses)) {
             list = Arrays.stream(statuses.split(",")).map(ProductStatus::valueOf).collect(Collectors.toList());
         }
-        return productService.list(search, batchId, list, toPageRequest(pageQuery));
+        return productService.list(search, batchId, list, toPageRequest(pageQuery), SecurityUtils.getAuthenticatedUser().getId());
     }
 
     @GetMapping("/reserveCount")