Merge remote-tracking branch 'origin/master'

曾国涛
2 parents 7c9a5a0d 649f1454
Showing 3 changed files with 48 additions and 7 deletions
shop/src/main/java/com/canrd/shop/controller/ProductController.java
shop/src/main/java/com/canrd/shop/service/ProductService.java
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
@@ -144,6 +144,11 @@ public class ProductController {
         return productService.listBySimilar(productQueryVO);
     }
  
+    @GetMapping("/hotProducts")
+    public ServerResult hotProducts(@Validated({OperateGroup.List.class}) ProductQueryVO productQueryVO) {
+        return productService.hotProducts(productQueryVO);
+    }
+
     /**
      * 生成静态页面
      *
@@ -65,4 +65,6 @@ public interface ProductService extends IService&lt;ProductDO&gt; {
     ServerResult categorySearch(ProductQueryVO productQueryVO);
  
     ServerResult chatgpt(ProductQueryVO productQueryVO);
+
+    ServerResult hotProducts(ProductQueryVO productQueryVO);
 }
@@ -213,13 +213,35 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
             productVO.setRelatedProductIds(relatedProductIds);
         }
  
-        List<JournalCategoryRelation> journalCategoryRelations = journalCategoryService.lambdaQuery()
-                .in(JournalCategoryRelation::getCategoryId, categoryIds)
-                .list();
-        List<Long> journalIds = journalCategoryRelations.stream().map(JournalCategoryRelation::getJournalId).collect(Collectors.toList());
-        List<Journal> journals = journalService.lambdaQuery()
-                .in(Journal::getId, journalIds)
-                .list();
+//        List<JournalCategoryRelation> journalCategoryRelations = journalCategoryService.lambdaQuery()
+//                .in(JournalCategoryRelation::getCategoryId, categoryIds)
+//                .list();
+//        List<Long> journalIds = journalCategoryRelations.stream().map(JournalCategoryRelation::getJournalId).collect(Collectors.toList());
+//        List<Journal> journals = journalService.lambdaQuery()
+//                .in(Journal::getId, journalIds)
+//                .list();
+        List<JournalCategoryRelation> journalCategoryRelations = null;
+        if (categoryIds != null && !categoryIds.isEmpty()) {
+            // 查询 journalCategoryRelations，仅在 categoryIds 不为空时执行
+            journalCategoryRelations = journalCategoryService.lambdaQuery()
+                    .in(JournalCategoryRelation::getCategoryId, categoryIds)
+                    .list();
+        } else {
+            journalCategoryRelations = Collections.emptyList(); // 如果 categoryIds 为空，返回空列表
+        }
+
+        List<Long> journalIds = journalCategoryRelations.stream()
+                .map(JournalCategoryRelation::getJournalId)
+                .collect(Collectors.toList());
+
+        // 查询 journals，仅在 journalIds 不为空时执行
+        List<Journal> journals = Collections.emptyList();
+        if (!journalIds.isEmpty()) {
+            journals = journalService.lambdaQuery()
+                    .in(Journal::getId, journalIds)
+                    .list();
+        }
+
         journals = journals.stream()
                 .collect(Collectors.toMap(
                         Journal::getTitle,
@@ -635,6 +657,18 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
         return null;
     }
  
+    @Override
+    public ServerResult hotProducts(ProductQueryVO productQueryVO) {
+        QueryWrapper<ProductQueryVO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("isHot", true)
+                    .eq("isMarketable",true); // 条件：isHot = true
+
+        Page page = new Page<>(productQueryVO.getPageNo(), productQueryVO.getPageSize());
+        IPage<ProductDO> iPage = productMapper.queryAll(page,queryWrapper);
+        productQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
+        return ServerResult.success().setData(PageUtils.getPageReturn(iPage.getRecords(), productQueryVO));
+    }
+
     private String translateHtmlOneProductFieldByChatGpt2(String source) throws IOException, InterruptedException {
         try{
             Thread.sleep(1000 * 20);