完善产品服务

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/open/OpenProductController.java

@@ -5,8 +5,10 @@ import com.fjhx.xmhjc.entity.about.vo.AboutUsHonorVo;
 import com.fjhx.xmhjc.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.xmhjc.entity.product.vo.ProductCategoryVo;
 import com.fjhx.xmhjc.entity.product.vo.ProductInfoVo;
+import com.fjhx.xmhjc.entity.product.vo.ProductSubCategoryVo;
 import com.fjhx.xmhjc.service.product.ProductCategoryService;
 import com.fjhx.xmhjc.service.product.ProductInfoService;
+import com.fjhx.xmhjc.service.product.ProductSubCategoryService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -18,6 +20,8 @@ public class OpenProductController {
     @Resource
     private ProductCategoryService productCategoryService;
     @Resource
+    private ProductSubCategoryService subCategoryService;
+    @Resource
     private ProductInfoService productInfoService;
 
     @PostMapping("/categoryList")
@@ -26,9 +30,16 @@ public class OpenProductController {
         return list;
     }
 
-    @PostMapping("/info/{categoryId}")
-    public Page<ProductInfoVo> productInfoList(@PathVariable Long categoryId, @RequestBody ProductInfoSelectDto dto) {
-        Page<ProductInfoVo> list = productInfoService.pageByOpen(categoryId, dto);
+
+    @PostMapping("/subCategoryList/{categoryId}")
+    public List<ProductSubCategoryVo> subCategoryList(@PathVariable Long categoryId) {
+        List<ProductSubCategoryVo> list = subCategoryService.listByOpen(categoryId);
+        return list;
+    }
+
+    @PostMapping("/info/{categoryId}/{subCategoryId}")
+    public Page<ProductInfoVo> productInfoList(@PathVariable Long categoryId, @PathVariable Long subCategoryId, @RequestBody ProductInfoSelectDto dto) {
+        Page<ProductInfoVo> list = productInfoService.pageByOpen(categoryId, subCategoryId, dto);
         return list;
     }
 

hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/product/ProductSubCategoryMapper.java

@@ -1,12 +1,16 @@
 package com.fjhx.xmhjc.mapper.product;
 
+import com.fjhx.xmhjc.entity.product.po.ProductCategory;
 import com.fjhx.xmhjc.entity.product.po.ProductSubCategory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.product.vo.ProductCategoryVo;
 import com.fjhx.xmhjc.entity.product.vo.ProductSubCategoryVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -19,6 +23,11 @@ import org.apache.ibatis.annotations.Param;
 public interface ProductSubCategoryMapper extends BaseMapper<ProductSubCategory> {
 
     /**
+     * 产品类目表列表
+     */
+    List<ProductSubCategoryVo> getList(@Param("ew") IWrapper<ProductSubCategory> wrapper);
+
+    /**
      * 产品类目表分页
      */
     Page<ProductSubCategoryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductSubCategory> wrapper);

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/ProductInfoService.java

@@ -49,5 +49,5 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
      */
     void delete(Long id);
 
-    Page<ProductInfoVo> pageByOpen(Long categoryId, ProductInfoSelectDto dto);
+    Page<ProductInfoVo> pageByOpen(Long categoryId, Long subCategoryId, ProductInfoSelectDto dto);
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/ProductSubCategoryService.java

@@ -51,4 +51,6 @@ public interface ProductSubCategoryService extends BaseService<ProductSubCategor
     void deleteByParentId(Long parentId);
 
     void dealSubCategory(Long id, List<ProductSubCategory> subCategoryList);
+
+    List<ProductSubCategoryVo> listByOpen(Long categoryId);
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/impl/ProductInfoServiceImpl.java

@@ -116,11 +116,12 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     }
 
     @Override
-    public Page<ProductInfoVo> pageByOpen(Long categoryId, ProductInfoSelectDto dto) {
+    public Page<ProductInfoVo> pageByOpen(Long categoryId, Long subCategoryId, ProductInfoSelectDto dto) {
         IWrapper<ProductInfo> wrapper = getWrapper();
         wrapper.orderByAsc("pi", ProductInfo::getSort);
         wrapper.eq("pi", ProductInfo::getStatus, "1");
         wrapper.eq("pi", ProductInfo::getCategoryId, categoryId);
+        wrapper.eq("pi", ProductInfo::getSubCategoryId, subCategoryId);
         Page<ProductInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/impl/ProductSubCategoryServiceImpl.java

@@ -80,4 +80,15 @@ public class ProductSubCategoryServiceImpl extends ServiceImpl<ProductSubCategor
         subCategoryList.forEach(item -> item.setParentId(parentId));
         saveBatch(subCategoryList);
     }
+
+
+    @Override
+    public List<ProductSubCategoryVo> listByOpen(Long categoryId) {
+        IWrapper<ProductSubCategory> wrapper = getWrapper();
+        wrapper.orderByDesc("psc", ProductSubCategory::getSort);
+        wrapper.eq("psc", ProductSubCategory::getStatus, "1");
+        wrapper.eq("psc", ProductSubCategory::getParentId, categoryId);
+        List<ProductSubCategoryVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
 }

hx-xmhjc/src/main/resources/mapper/product/ProductSubCategoryMapper.xml

@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.xmhjc.mapper.product.ProductSubCategoryMapper">
+
+    <select id="getList" resultType="com.fjhx.xmhjc.entity.product.vo.ProductSubCategoryVo">
+        select
+            psc.id,
+            psc.name,
+            psc.code,
+            psc.sort,
+            psc.create_user,
+            psc.create_time,
+            psc.update_user,
+            psc.update_time,
+            psc.status,
+            psc.parent_id
+        from product_sub_category psc
+            ${ew.customSqlSegment}
+    </select>
+
+
     <select id="getPage" resultType="com.fjhx.xmhjc.entity.product.vo.ProductSubCategoryVo">
         select
             psc.id,