优化了分页查询商品列表(H5接口)

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ProductController.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
@@ -55,7 +56,7 @@ public class ProductController extends BaseController {
      *
      * @param page    分页对象
      * @param product 商品实体
-     * @return R<Page<Product>> 所有数据
+     * @return R<Page < Product>> 所有数据
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation("PC查询商品管理列表")
@@ -87,19 +88,21 @@ public class ProductController extends BaseController {
      *
      * @param page      分页对象
      * @param product   商品实体
+     * @param name      商品名称
      * @param sortField 排序字段（price:价格, sales:销量）
      * @param sortOrder 排序方式（asc:升序, desc:降序）
-     * @return R<Page<H5ProductVo>> 所有数据
+     * @return R<Page < H5ProductVo>> 所有数据
      */
     @RequestMapping(value = "/h5List", method = RequestMethod.GET)
     @ApiOperation("H5查询商品管理列表")
-    public R<Page<H5ProductVo>> selectH5All(Page<H5ProductVo> page, Product product, @RequestParam(required = false) String sortField, @RequestParam(required = false) String sortOrder) {
+    public R<Page<H5ProductVo>> selectH5All(Page<H5ProductVo> page, Product product, @RequestParam(required = false) String name, @RequestParam(required = false) String sortField, @RequestParam(required = false) String sortOrder) {
         try {
-            Page<H5ProductVo> pageResult = productService.selectH5Page(page, product, sortField, sortOrder);
+            Page<H5ProductVo> pageResult = productService.selectH5Page(page, product, name, sortField, sortOrder);
             //根据分类ID查询分类的名称
             for (H5ProductVo record : pageResult.getRecords()) {
                 ProductCategory productCategory = this.productCategoryService.getById(record.getCategoryId());
                 if (productCategory != null) {
+                    // 设置分类名称
                     record.setCategoryName(productCategory.getName());
                 }
                 //根据商品ID查询库存的最低价格

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/H5ProductVo.java

@@ -32,6 +32,16 @@ public class H5ProductVo {
      */
     private String name;
 
+    /**
+     * 商品图片
+     */
+    private String productMainImage;
+
+    /**
+     * 付款类型(1：积分 2：金额 3：积分+金额)
+     */
+    private Integer paymentType;
+
     /**
      * 商品积分价格
      */

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/ProductMapper.java

@@ -23,6 +23,6 @@ public interface ProductMapper extends BaseMapper<Product> {
      * @param sortOrder 排序方式（asc:升序, desc:降序）
      * @return Page<Product> 分页结果
      */
-    Page<H5ProductVo> selectH5Page(Page<H5ProductVo> page, @Param("product") Product product, @Param("sortField") String sortField, @Param("sortOrder") String sortOrder);
+    Page<H5ProductVo> selectH5Page(Page<H5ProductVo> page, @Param("product") Product product, @Param("name")String name, @Param("sortField") String sortField, @Param("sortOrder") String sortOrder);
 
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/ProductService.java

@@ -69,6 +69,6 @@ public interface ProductService extends IService<Product> {
      * @param sortOrder 排序方式（asc:升序, desc:降序）
      * @return Page<Product> 分页结果
      */
-    Page<H5ProductVo> selectH5Page(Page<H5ProductVo> page, Product product, String sortField, String sortOrder);
+    Page<H5ProductVo> selectH5Page(Page<H5ProductVo> page, Product product, String name,String sortField, String sortOrder);
 
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductServiceImpl.java

@@ -301,8 +301,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
      * @return Page<Product> 分页结果
      */
     @Override
-    public Page<H5ProductVo> selectH5Page(Page<H5ProductVo> page, Product product, String sortField, String sortOrder) {
-        return productMapper.selectH5Page(page, product, sortField, sortOrder);
+    public Page<H5ProductVo> selectH5Page(Page<H5ProductVo> page, Product product, String name,String sortField, String sortOrder) {
+        return productMapper.selectH5Page(page, product, name,sortField, sortOrder);
     }
 
     /**

nightFragrance-massage/src/main/resources/mapper/massage/ProductMapper.xml

@@ -4,12 +4,16 @@
 
     <!-- 分页查询商品列表(H5端)-支持排序 -->
     <select id="selectH5Page" resultType="com.ylx.massage.domain.vo.H5ProductVo">
-        SELECT id, category_id, product_no,name,price_point, price_money, stock, sales
+        SELECT id, category_id, product_no,name,price_point, price_money, stock, sales,product_main_image,payment_type
         FROM product
         WHERE deleted = 0 AND status = 1
         <if test="product.categoryId != null">
             AND category_id = #{product.categoryId}
         </if>
+        <!--根据商品名称模糊搜索-->
+        <if test="name != null and name!='' ">
+            and name like concat('%',#{name},'%')
+        </if>
         <choose>
             <when test="sortField != null and sortField != '' and sortOrder != null and sortOrder != ''">
                 ORDER BY