diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e7bc0f..af07cc8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,17 +4,18 @@
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
@@ -24,9 +25,9 @@
@@ -79,7 +80,7 @@
"project.structure.last.edited": "Project",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.2",
- "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler",
+ "settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors.XML",
"vue.rearranger.settings.migration": "true"
},
"keyToStringList": {
@@ -154,7 +155,7 @@
1703487755445
-
+
@@ -188,7 +189,15 @@
1703552833275
-
+
+
+ 1703557481401
+
+
+
+ 1703557481401
+
+
@@ -198,7 +207,8 @@
-
+
+
@@ -211,4 +221,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/controller/BrandController.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/controller/BrandController.java
new file mode 100644
index 0000000..d93afff
--- /dev/null
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/controller/BrandController.java
@@ -0,0 +1,27 @@
+package cn.bunny.web.product.controller;
+
+import cn.bunny.common.spzx.model.entity.product.Brand;
+import cn.bunny.common.spzx.model.vo.common.Result;
+import cn.bunny.common.spzx.model.vo.common.ResultCodeEnum;
+import cn.bunny.web.product.service.BrandService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value="/api/product/brand")
+public class BrandController {
+ @Resource
+ private BrandService brandService;
+
+ @Operation(summary = "获取全部品牌")
+ @GetMapping("findAll")
+ public Result findAll() {
+ List brandList = brandService.findAll();
+ return Result.build(brandList, ResultCodeEnum.SUCCESS);
+ }
+}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/controller/ProductController.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/controller/ProductController.java
new file mode 100644
index 0000000..5c21da2
--- /dev/null
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/controller/ProductController.java
@@ -0,0 +1,30 @@
+package cn.bunny.web.product.controller;
+
+import cn.bunny.common.spzx.model.dto.h5.ProductSkuDto;
+import cn.bunny.common.spzx.model.entity.product.ProductSku;
+import cn.bunny.common.spzx.model.vo.common.Result;
+import cn.bunny.common.spzx.model.vo.common.ResultCodeEnum;
+import cn.bunny.web.product.service.ProductService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/product")
+public class ProductController {
+ @Resource
+ private ProductService productService;
+
+ @Operation(summary = "分页查询")
+ @GetMapping(value = "/{page}/{limit}")
+ public Result findByPage(@PathVariable("page") Integer page,
+ @PathVariable("limit") Integer limit,
+ ProductSkuDto productSkuDto) {
+ PageInfo pageInfo = productService.findByPage(page, limit, productSkuDto);
+ return Result.build(pageInfo, ResultCodeEnum.SUCCESS);
+ }
+}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/BrandMapper.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/BrandMapper.java
new file mode 100644
index 0000000..8116793
--- /dev/null
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/BrandMapper.java
@@ -0,0 +1,12 @@
+package cn.bunny.web.product.mapper;
+
+import cn.bunny.common.spzx.model.entity.product.Brand;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BrandMapper {
+ // 获取全部品牌列表
+ List findAll();
+}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/ProductSkuMapper.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/ProductSkuMapper.java
index 4d86d87..d5ab9c9 100644
--- a/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/ProductSkuMapper.java
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/mapper/ProductSkuMapper.java
@@ -1,5 +1,6 @@
package cn.bunny.web.product.mapper;
+import cn.bunny.common.spzx.model.dto.h5.ProductSkuDto;
import cn.bunny.common.spzx.model.entity.product.Category;
import cn.bunny.common.spzx.model.entity.product.ProductSku;
import org.apache.ibatis.annotations.Mapper;
@@ -10,4 +11,6 @@ import java.util.List;
public interface ProductSkuMapper {
List selectProductSkuBySale();
+ // 分页查询
+ List findByPage(ProductSkuDto productSkuDto);
}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/BrandService.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/BrandService.java
new file mode 100644
index 0000000..d23eb58
--- /dev/null
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/BrandService.java
@@ -0,0 +1,10 @@
+package cn.bunny.web.product.service;
+
+import cn.bunny.common.spzx.model.entity.product.Brand;
+
+import java.util.List;
+
+public interface BrandService {
+ // 获取全部品牌
+ List findAll();
+}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/ProductService.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/ProductService.java
index 75fe675..d26cd02 100644
--- a/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/ProductService.java
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/ProductService.java
@@ -1,11 +1,15 @@
package cn.bunny.web.product.service;
+import cn.bunny.common.spzx.model.dto.h5.ProductSkuDto;
import cn.bunny.common.spzx.model.entity.product.Category;
import cn.bunny.common.spzx.model.entity.product.ProductSku;
+import com.github.pagehelper.PageInfo;
import java.util.List;
public interface ProductService {
// 根据销量排序,获取前十条激励
List selectProductSkuBySal();
+ // 分页查询
+ PageInfo findByPage(Integer page, Integer limit, ProductSkuDto productSkuDto);
}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/BrandServiceImpl.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/BrandServiceImpl.java
new file mode 100644
index 0000000..431a391
--- /dev/null
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/BrandServiceImpl.java
@@ -0,0 +1,24 @@
+package cn.bunny.web.product.service.imp;
+
+import cn.bunny.common.spzx.model.entity.product.Brand;
+import cn.bunny.web.product.mapper.BrandMapper;
+import cn.bunny.web.product.service.BrandService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BrandServiceImpl implements BrandService {
+ @Resource
+ private BrandMapper brandMapper;
+
+ /***
+ * 获取全部品牌
+ * @return 获取全部品牌列表
+ */
+ @Override
+ public List findAll() {
+ return brandMapper.findAll();
+ }
+}
diff --git a/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/ProductServiceImpl.java b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/ProductServiceImpl.java
index 712daab..63fe9e1 100644
--- a/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/ProductServiceImpl.java
+++ b/spzx-service/service-product/src/main/java/cn/bunny/web/product/service/imp/ProductServiceImpl.java
@@ -1,10 +1,13 @@
package cn.bunny.web.product.service.imp;
+import cn.bunny.common.spzx.model.dto.h5.ProductSkuDto;
import cn.bunny.common.spzx.model.entity.product.ProductSku;
import cn.bunny.web.product.mapper.ProductSkuMapper;
import cn.bunny.web.product.service.ProductService;
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.StringUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import jakarta.annotation.Resource;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.redis.core.RedisTemplate;
@@ -44,4 +47,12 @@ public class ProductServiceImpl implements ProductService {
}
return productSkuMapper.selectProductSkuBySale();
}
+
+ // 分页查询
+ @Override
+ public PageInfo findByPage(Integer page, Integer limit, ProductSkuDto productSkuDto) {
+ PageHelper.startPage(page, page);
+ List productSkuList = productSkuMapper.findByPage(productSkuDto);
+ return new PageInfo<>(productSkuList);
+ }
}
diff --git a/spzx-service/service-product/src/main/resources/mapper/product/BrandMapper.xml b/spzx-service/service-product/src/main/resources/mapper/product/BrandMapper.xml
new file mode 100644
index 0000000..40d19f3
--- /dev/null
+++ b/spzx-service/service-product/src/main/resources/mapper/product/BrandMapper.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/spzx-service/service-product/src/main/resources/mapper/product/ProductSkuMapper.xml b/spzx-service/service-product/src/main/resources/mapper/product/ProductSkuMapper.xml
index 5099746..271c1b4 100644
--- a/spzx-service/service-product/src/main/resources/mapper/product/ProductSkuMapper.xml
+++ b/spzx-service/service-product/src/main/resources/mapper/product/ProductSkuMapper.xml
@@ -20,4 +20,41 @@
order by sku.sale_num desc
limit 10
+
+