【优化】产品接口

src/main/java/com/corewing/app/entity/BizProduct.java

@@ -25,8 +25,12 @@ public class BizProduct extends CommonEntity {
 
     private String hotStatus;
 
+    private String showType;
+
     private String content;
 
+    private String tag;
+
     private String detailUrl;
 
     private BigDecimal amount;
@@ -42,6 +46,4 @@ public class BizProduct extends CommonEntity {
     @TableField(exist = false)
     private String categoryId;
 
-
-
 }

src/main/java/com/corewing/app/entity/BizProductCategory.java

@@ -8,6 +8,8 @@ import com.corewing.app.common.base.CommonEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("biz_product_category")
@@ -34,5 +36,4 @@ public class BizProductCategory extends CommonEntity {
 
     @TableField(exist = false)
     Page<BizProduct> productPage;
-
 }

src/main/java/com/corewing/app/mapper/BizProductCategoryMapper.java

@@ -11,5 +11,5 @@ import java.util.List;
 @Mapper
 public interface BizProductCategoryMapper extends BaseMapper<BizProductCategory> {
 
-    List<BizProductCategory> list(@Param("productCategoryRequest") ProductCategoryRequest productCategoryRequest);
+
 }

src/main/java/com/corewing/app/service/impl/BizProductCategroyServiceImpl.java

@@ -1,5 +1,7 @@
 package com.corewing.app.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.corewing.app.dto.website.ProductCategoryRequest;
@@ -25,13 +27,17 @@ public class BizProductCategroyServiceImpl extends ServiceImpl<BizProductCategor
 
     @Override
     public List<BizProductCategory> list(ProductCategoryRequest productCategoryRequest) {
-        List<BizProductCategory> bizProductCategory = bizProductCategoryMapper.list(productCategoryRequest);
-        bizProductCategory.forEach(item -> {
-            ProductPageRequest query = new ProductPageRequest();
-            query.setCategoryId(item.getId());
-            Page<BizProduct> page = bizProductService.page(query);
+        LambdaQueryWrapper<BizProductCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotBlank(productCategoryRequest.getSearchKey()), BizProductCategory::getCategoryTitle, productCategoryRequest.getSearchKey());
+        List<BizProductCategory> bizProductCategories = bizProductCategoryMapper.selectList(queryWrapper);
+
+        bizProductCategories.forEach(item -> {
+            ProductPageRequest  productPageRequest = new ProductPageRequest();
+            productPageRequest.setCategoryId(item.getId());
+            Page<BizProduct> page = bizProductService.page(productPageRequest);
             item.setProductPage(page);
         });
-        return bizProductCategory;
+
+        return bizProductCategories;
     }
 }

src/main/java/com/corewing/app/service/impl/BizProductServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.corewing.app.common.page.PageContext;
 import com.corewing.app.dto.website.ProductPageRequest;
-import com.corewing.app.entity.AppModel;
 import com.corewing.app.entity.BizProduct;
 import com.corewing.app.mapper.BizProductMapper;
 import com.corewing.app.service.BizProductService;

src/main/resources/mapper/BizProductCategoryMapper.xml

@@ -9,15 +9,6 @@
         FROM biz_product_category pc
     </sql>
 
-    <!-- 分页查询 -->
-    <select id="list" resultType="com.corewing.app.entity.BizProductCategory">
-        <include refid="selectVOSql"/>
-        <where>
-            <if test="productCategoryRequest.searchKey != null and productCategoryRequest.searchKey != ''">
-               and pc.category_title like CONCAT('%', #{productCategoryRequest.searchKey}, '%')
-            </if>
-        </where>
-    </select>
 
 
 </mapper>

src/main/resources/mapper/BizProductMapper.xml

@@ -21,6 +21,7 @@
             <if test="productPageRequest.searchKey != null and productPageRequest.searchKey != ''">
                and p.title like CONCAT('%', #{productPageRequest.searchKey}, '%')
             </if>
+            and delete_flag = 'NOT_DELETE'
         </where>
     </select>