完成的商品搜索和条件功能

2020-08-04 19:42:54 +08:00
parent f3316d14c7
commit b83262af5f
240 changed files with 246 additions and 859 deletions
--- a/moved/product/product-start/pom.xml
+++ b/moved/product/product-start/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>product</artifactId>
+        <groupId>cn.iocoder.mall</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>product-start</artifactId>
+
+    <dependencies>
+        <!-- Mall 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>common-framework</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>product-service-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>product-service-impl</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot-starter-mybatis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+        </dependency>
+
+        <!-- 服务保障相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!--  监控  -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+        <!-- 测试相关 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot-starter-security</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 提供给 mapstruct 使用 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+
+            <!-- 打包 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java
@@ -0,0 +1,44 @@
+package cn.iocoder.mall.product.application.controller.admins;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.product.api.ProductAttrService;
+import cn.iocoder.mall.product.api.bo.ProductAttrBO;
+import cn.iocoder.mall.product.api.bo.ProductAttrPageBO;
+import cn.iocoder.mall.product.api.bo.ProductAttrSimpleBO;
+import cn.iocoder.mall.product.api.bo.ProductAttrValueBO;
+import cn.iocoder.mall.product.api.dto.*;
+import cn.iocoder.mall.product.application.convert.ProductAttrConvert;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrPageVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrSimpleVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrValueVO;
+import cn.iocoder.mall.security.core.context.AdminSecurityContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.common.framework.vo.CommonResult.success;
+
+@RestController
+@RequestMapping("admins")
+@Api("商品规格")
+public class AdminsProductAttrController {
+
+    @Reference(validation = "true", version = "${dubbo.provider.ProductAttrService.version}")
+    private ProductAttrService productAttrService;
+
+    @GetMapping("/attr/tree")
+    @ApiOperation(value = "获得规格树结构", notes = "该接口返回的信息更为精简。一般用于前端缓存数据字典到本地。")
+    public CommonResult<List<AdminsProductAttrSimpleVO>> tree() {
+        // 查询全列表
+        List<ProductAttrSimpleBO> result = productAttrService.getProductAttrList();
+        // 返回结果
+        return success(ProductAttrConvert.INSTANCE.convert(result));
+    }
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java
@@ -0,0 +1,71 @@
+package cn.iocoder.mall.product.application.controller.admins;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.product.api.ProductSpuService;
+import cn.iocoder.mall.product.api.bo.ProductSpuBO;
+import cn.iocoder.mall.product.api.bo.ProductSpuDetailBO;
+import cn.iocoder.mall.product.api.bo.ProductSpuPageBO;
+import cn.iocoder.mall.product.api.dto.*;
+import cn.iocoder.mall.product.application.convert.ProductSpuConvert;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuDetailVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuPageVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuVO;
+import cn.iocoder.mall.security.core.context.AdminSecurityContextHolder;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.common.framework.vo.CommonResult.success;
+
+@RestController
+@RequestMapping("admins")
+@Api("商品 SPU + SKU")
+public class AdminsProductSpuController {
+
+    @PostMapping("/spu/update_sort")
+    @ApiOperation("更新商品的排序")
+    public CommonResult<Boolean> updateSort(@RequestParam("id") Integer id,
+                                            @RequestParam("sort") Integer sort) {
+        return success(productSpuService.updateProductSpuSort(AdminSecurityContextHolder.getContext().getAdminId(), id, sort));
+    }
+
+    @GetMapping("/spu/search_list")
+    @ApiOperation("商品 SPU 搜索列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "商品名称，模糊匹配", example = "小王"),
+    })
+    public CommonResult<List<AdminsProductSpuVO>> spuSearchList(@RequestParam(value = "name", required = false) String name) {
+        // 创建 ProductSpuSearchListDTO 对象
+        ProductSpuSearchListDTO productSpuSearchListDTO = new ProductSpuSearchListDTO().setName(name);
+        // 执行搜索
+        List<ProductSpuBO> list = productSpuService.getProductSpuSearchList(productSpuSearchListDTO);
+        // 转换返回
+        return success(ProductSpuConvert.INSTANCE.convert3(list));
+    }
+
+    @GetMapping("/spu/info")
+    @ApiOperation("商品 SPU 明细")
+    @ApiImplicitParam(name = "id", value = "SPU 编号", required = true, example = "100")
+    public CommonResult<AdminsProductSpuDetailVO> spuInfo(@RequestParam("id") Integer id) {
+        return success(ProductSpuConvert.INSTANCE.convert(productSpuService.getProductSpuDetail(id)));
+    }
+
+    @GetMapping("/spu/list")
+    @ApiOperation("商品 SPU 列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "商品 SPU 编号数组", example = "1,2,3"),
+    })
+    public CommonResult<List<AdminsProductSpuVO>> spuList(@RequestParam("ids") Collection<Integer> ids) {
+        List<ProductSpuBO> list = productSpuService.getProductSpuList(ids);
+        // 转换返回
+        return success(ProductSpuConvert.INSTANCE.convert3(list));
+    }
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java
@@ -0,0 +1,50 @@
+package cn.iocoder.mall.product.application.controller.users;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.product.api.UserProductSpuCollectionsService;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsPageBO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsPageDTO;
+import cn.iocoder.mall.security.core.context.UserSecurityContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户收藏
+ * @author xiaofeng
+ * @date 2019/07/07 11:06
+ * @version 1.0
+ */
+@RestController
+@RequestMapping("users/favorite")
+@Api("用户收藏")
+public class UserFavoriteController {
+
+    @Reference(validation = "true", version = "${dubbo.provider.UserProductSpuCollectionsService.version}")
+    private UserProductSpuCollectionsService userProductSpuCollectionsService;
+
+    @GetMapping("page")
+    @ApiOperation("用户商品收藏列表")
+    public CommonResult<UserProductSpuCollectionsPageBO> getUserProductSpuCollectionsPage(
+            @Validated UserProductSpuCollectionsPageDTO userProductSpuCollectionsPageDTO) {
+        final Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        userProductSpuCollectionsPageDTO.setUserId(userId);
+        return userProductSpuCollectionsService.getUserProductSpuCollectionsPage(userProductSpuCollectionsPageDTO);
+    }
+
+    @DeleteMapping("remove")
+    @ApiOperation(value = "用户商品收藏-删除")
+    public CommonResult<Boolean> removeUserFavorite(@RequestParam("spuId") final Integer spuId) {
+        final Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        return userProductSpuCollectionsService.deleteUserProductSpuCollections(userId, spuId);
+    }
+
+    @GetMapping("hasUserFavorite")
+    @ApiOperation(value = "用户商品收藏-是否收藏")
+    public CommonResult<Boolean> hasUserSpuFavorite(@RequestParam("spuId") final Integer spuId) {
+        final Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        return userProductSpuCollectionsService.hasUserSpuFavorite(spuId, userId);
+    }
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuCollectionController.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuCollectionController.java
@@ -0,0 +1,37 @@
+package cn.iocoder.mall.product.application.controller.users;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.product.api.ProductSpuCollectionService;
+import cn.iocoder.mall.security.core.context.UserSecurityContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.common.framework.vo.CommonResult.success;
+
+/**
+ * 商品收藏接口
+ * @author xiaofeng
+ * @date 2019/07/01 23:21
+ * @version 1.0
+ */
+@RestController
+@RequestMapping("users/spu")
+@Api("商品收藏")
+public class UsersProductSpuCollectionController {
+
+    @Reference(validation = "true", version = "${dubbo.provider.ProductSpuCollectionService.version}")
+    private ProductSpuCollectionService productSpuCollectionService;
+
+    @PostMapping("/collection/{spuId}/{hasCollectionType}")
+    @ApiOperation("商品收藏")
+    public CommonResult<Boolean> productSpuCollection(@PathVariable("spuId") Integer spuId,
+            @PathVariable("hasCollectionType") Integer hasCollectionType) {
+        final Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        return success(productSpuCollectionService.productSpuCollection(spuId, hasCollectionType,userId));
+    }
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java
@@ -0,0 +1,57 @@
+package cn.iocoder.mall.product.application.controller.users;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.product.api.ProductSpuService;
+import cn.iocoder.mall.product.api.bo.ProductSpuPageBO;
+import cn.iocoder.mall.product.api.dto.ProductSpuPageDTO;
+import cn.iocoder.mall.product.application.convert.ProductSpuConvert;
+import cn.iocoder.mall.product.application.vo.users.UsersProductSpuDetailVO;
+import cn.iocoder.mall.product.application.vo.users.UsersProductSpuPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.common.framework.vo.CommonResult.success;
+
+@RestController
+@RequestMapping("users/spu")
+@Api("商品 SPU + SKU")
+public class UsersProductSpuController {
+
+    @Reference(validation = "true", version = "${dubbo.provider.ProductSpuService.version}")
+    private ProductSpuService productSpuService;
+
+    @GetMapping("/info")
+    @ApiOperation("商品 SPU 明细")
+    @ApiImplicitParam(name = "id", value = "SPU 编号", required = true, example = "100")
+    public CommonResult<UsersProductSpuDetailVO> info(@RequestParam("id") Integer id) {
+        return success(ProductSpuConvert.INSTANCE.convert4(productSpuService.getProductSpuDetail(id)));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("商品 SPU 分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "cid", value = "分类编号", example = "1"),
+            @ApiImplicitParam(name = "pageNo", value = "页码，从 1 开始", example = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", required = true, example = "10"),
+    })
+    @Deprecated // 使用商品搜索接口
+    public CommonResult<UsersProductSpuPageVO> page(@RequestParam(value = "cid", required = false) Integer cid,
+                                                    @RequestParam(value = "pageNo", defaultValue = "0") Integer pageNo,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        // 创建 ProductSpuPageDTO 对象
+        ProductSpuPageDTO productSpuPageDTO = new ProductSpuPageDTO().setCid(cid).setVisible(true)
+                .setPageNo(pageNo).setPageSize(pageSize);
+        // 查询分页
+        ProductSpuPageBO result = productSpuService.getProductSpuPage(productSpuPageDTO);
+        // 返回结果
+        return success(ProductSpuConvert.INSTANCE.convert3(result));
+    }
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductAttrConvert.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductAttrConvert.java
@@ -0,0 +1,34 @@
+package cn.iocoder.mall.product.application.convert;
+
+import cn.iocoder.mall.product.api.bo.ProductAttrBO;
+import cn.iocoder.mall.product.api.bo.ProductAttrPageBO;
+import cn.iocoder.mall.product.api.bo.ProductAttrSimpleBO;
+import cn.iocoder.mall.product.api.bo.ProductAttrValueBO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrPageVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrSimpleVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrValueVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface ProductAttrConvert {
+
+    ProductAttrConvert INSTANCE = Mappers.getMapper(ProductAttrConvert.class);
+
+    @Mappings({})
+    AdminsProductAttrPageVO convert2(ProductAttrPageBO result);
+
+    @Mappings({})
+    List<AdminsProductAttrSimpleVO> convert(List<ProductAttrSimpleBO> result);
+
+    @Mappings({})
+    AdminsProductAttrVO convert3(ProductAttrBO productAttrBO);
+
+    @Mappings({})
+    AdminsProductAttrValueVO convert4(ProductAttrValueBO productAttrValueBO);
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductSpuConvert.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductSpuConvert.java
@@ -0,0 +1,40 @@
+package cn.iocoder.mall.product.application.convert;
+
+import cn.iocoder.mall.product.api.bo.ProductSpuBO;
+import cn.iocoder.mall.product.api.bo.ProductSpuDetailBO;
+import cn.iocoder.mall.product.api.bo.ProductSpuPageBO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuDetailVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuPageVO;
+import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuVO;
+import cn.iocoder.mall.product.application.vo.users.UsersProductSpuDetailVO;
+import cn.iocoder.mall.product.application.vo.users.UsersProductSpuPageVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface ProductSpuConvert {
+
+    ProductSpuConvert INSTANCE = Mappers.getMapper(ProductSpuConvert.class);
+
+    @Mappings({})
+    AdminsProductSpuDetailVO convert(ProductSpuDetailBO productSpuDetailBO);
+
+//    @Mappings({})
+//    CommonResult<AdminsProductSpuDetailVO> convert(CommonResult<ProductSpuDetailBO> result);
+
+    @Mappings({})
+    AdminsProductSpuPageVO convert2(ProductSpuPageBO result);
+
+    @Mappings({})
+    List<AdminsProductSpuVO> convert3(List<ProductSpuBO> result);
+
+    @Mappings({})
+    UsersProductSpuPageVO convert3(ProductSpuPageBO result);
+
+    @Mappings({})
+    UsersProductSpuDetailVO convert4(ProductSpuDetailBO result);
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@ApiModel(value = "商品规格属性和值对 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrAndValuePairVO {
+
+    @ApiModelProperty(value = "规格编号", required = true, example = "1")
+    private Integer attrId;
+    @ApiModelProperty(value = "规格名", required = true, example = "颜色")
+    private String attrName;
+    @ApiModelProperty(value = "规格值", required = true, example = "10")
+    private Integer attrValueId;
+    @ApiModelProperty(value = "规格值名", required = true, example = "红色")
+    private String attrValueName;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+@ApiModel(value = "商品规格明细 VO", description = "带有规格值数组")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrDetailVO {
+
+    @ApiModelProperty(value = "规格编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "规格名", required = true, example = "颜色")
+    private String name;
+    @ApiModelProperty(value = "状态", required = true, example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
+    private Date createTime;
+    @ApiModelProperty(value = "规格值数组", required = true)
+    private List<AdminsProductAttrValueDetailVO> values;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "商品规格明细分页 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrPageVO {
+
+    @ApiModelProperty(value = "规格数组", required = true)
+    private List<AdminsProductAttrDetailVO> attrs;
+    @ApiModelProperty(value = "总数", required = true)
+    private Integer count;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "商品规格精简 VO", description = "带有规格值数组")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrSimpleVO {
+
+    @ApiModelProperty(value = "规格编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "规格名", required = true, example = "颜色")
+    private String name;
+    @ApiModelProperty(value = "规格值数组", required = true)
+    private List<AdminsProductAttrValueSimpleVO> values;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@ApiModel(value = "商品规格 VO", description = "不带有规格值数组")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrVO {
+
+    @ApiModelProperty(value = "规格编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "规格名", required = true, example = "颜色")
+    private String name;
+    @ApiModelProperty(value = "状态", required = true, example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
+    private Date createTime;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@ApiModel(value = "商品规格值 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrValueDetailVO {
+
+    @ApiModelProperty(value = "规格值编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "规格值名", required = true, example = "颜色")
+    private String name;
+    @ApiModelProperty(value = "状态", required = true, example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
+    private Date createTime;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java
@@ -0,0 +1,18 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@ApiModel(value = "商品规格值精简 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrValueSimpleVO {
+
+    @ApiModelProperty(value = "规格值编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "规格值名", required = true, example = "颜色")
+    private String name;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@ApiModel(value = "商品规格值 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductAttrValueVO {
+
+    @ApiModelProperty(value = "规格值编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "规格编号", required = true, example = "1")
+    private Integer attrId;
+    @ApiModelProperty(value = "规格名", required = true, example = "颜色")
+    private String name;
+    @ApiModelProperty(value = "状态", required = true, example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
+    private Date createTime;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 商品 Sku 明细 BO
+ */
+@Data
+@Accessors(chain = true)
+public class AdminsProductSkuDetailVO {
+
+    @ApiModelProperty(value = "sku 编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "SPU 编号", required = true, example = "1")
+    private Integer spuId;
+    @ApiModelProperty(value = "图片地址", required = true, example = "http://www.iocoder.cn")
+    private String picURL;
+    @ApiModelProperty(value = "规格值数组", required = true)
+    private List<AdminsProductAttrAndValuePairVO> attrs;
+    @ApiModelProperty(value = "价格，单位：分", required = true, example = "100")
+    private Integer price;
+    @ApiModelProperty(value = "库存数量", required = true, example = "100")
+    private Integer quantity;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "商品 SPU 详细 VO", description = "包括 SKU 信息 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductSpuDetailVO {
+
+    @ApiModelProperty(value = "SPU 编号", required = true, example = "1")
+    private Integer id;
+
+    // ========== 基本信息 =========
+    @ApiModelProperty(value = "SPU 名字", required = true, example = "厮大牛逼")
+    private String name;
+    @ApiModelProperty(value = "卖点", required = true, example = "各种 MQ 骚操作")
+    private String sellPoint;
+    @ApiModelProperty(value = "描述", required = true, example = "你就说强不强")
+    private String description;
+    @ApiModelProperty(value = "分类编号", required = true, example = "反正我是信了")
+    private Integer cid;
+    @ApiModelProperty(value = "商品主图地址的数组", required = true, example = "http://www.iocoder.cn")
+    private List<String> picUrls;
+
+    // ========== 其他信息 =========
+    @ApiModelProperty(value = "是否上架商品（是否可见）", required = true, example = "true")
+    private Boolean visible;
+    @ApiModelProperty(value = "排序字段", required = true, example = "10")
+    private Integer sort;
+
+    // ========== SKU =========
+
+    /**
+     * SKU 数组
+     */
+    private List<AdminsProductSkuDetailVO> skus;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel("商品 SPU 分页 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductSpuPageVO {
+
+    @ApiModelProperty(value = "spu 数组", required = true)
+    private List<AdminsProductSpuVO> list;
+    @ApiModelProperty(value = "总数", required = true)
+    private Integer total;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.mall.product.application.vo.admins;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "商品 SPU VO", description = "不包括 SKU 信息 VO")
+@Data
+@Accessors(chain = true)
+public class AdminsProductSpuVO {
+
+    @ApiModelProperty(value = "SPU 编号", required = true, example = "1")
+    private Integer id;
+
+    // ========== 基本信息 =========
+    @ApiModelProperty(value = "SPU 名字", required = true, example = "厮大牛逼")
+    private String name;
+    @ApiModelProperty(value = "卖点", required = true, example = "各种 MQ 骚操作")
+    private String sellPoint;
+    @ApiModelProperty(value = "描述", required = true, example = "你就说强不强")
+    private String description;
+    @ApiModelProperty(value = "分类编号", required = true, example = "反正我是信了")
+    private Integer cid;
+    @ApiModelProperty(value = "商品主图地址的数组", required = true, example = "http://www.iocoder.cn")
+    private List<String> picUrls;
+    @ApiModelProperty(value = "库存数量", required = true, example = "10")
+    private Integer quantity;
+
+    // ========== 其他信息 =========
+    @ApiModelProperty(value = "是否上架商品（是否可见）", required = true, example = "true")
+    private Boolean visible;
+    @ApiModelProperty(value = "排序字段", required = true, example = "10")
+    private Integer sort;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.mall.product.application.vo.users;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@ApiModel(value = "商品规格属性和值对 VO")
+@Data
+@Accessors(chain = true)
+public class UsersProductAttrAndValuePairVO {
+
+    @ApiModelProperty(value = "规格编号", required = true, example = "1")
+    private Integer attrId;
+    @ApiModelProperty(value = "规格名", required = true, example = "颜色")
+    private String attrName;
+    @ApiModelProperty(value = "规格值", required = true, example = "10")
+    private Integer attrValueId;
+    @ApiModelProperty(value = "规格值名", required = true, example = "红色")
+    private String attrValueName;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.mall.product.application.vo.users;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 商品 Sku 明细 BO
+ */
+@Data
+@Accessors(chain = true)
+public class UsersProductSkuDetailVO {
+
+    @ApiModelProperty(value = "sku 编号", required = true, example = "1")
+    private Integer id;
+    @ApiModelProperty(value = "SPU 编号", required = true, example = "1")
+    private Integer spuId;
+    @ApiModelProperty(value = "图片地址", required = true, example = "http://www.iocoder.cn")
+    private String picURL;
+    @ApiModelProperty(value = "规格值数组", required = true)
+    private List<UsersProductAttrAndValuePairVO> attrs;
+    @ApiModelProperty(value = "价格，单位：分", required = true, example = "100")
+    private Integer price;
+    @ApiModelProperty(value = "库存数量", required = true, example = "100")
+    private Integer quantity;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.mall.product.application.vo.users;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "商品 SPU 详细 VO", description = "包括 SKU 信息 VO")
+@Data
+@Accessors(chain = true)
+public class UsersProductSpuDetailVO {
+
+    @ApiModelProperty(value = "SPU 编号", required = true, example = "1")
+    private Integer id;
+
+    // ========== 基本信息 =========
+    @ApiModelProperty(value = "SPU 名字", required = true, example = "厮大牛逼")
+    private String name;
+    @ApiModelProperty(value = "卖点", required = true, example = "各种 MQ 骚操作")
+    private String sellPoint;
+    @ApiModelProperty(value = "描述", required = true, example = "你就说强不强")
+    private String description;
+    @ApiModelProperty(value = "分类编号", required = true, example = "反正我是信了")
+    private Integer cid;
+    @ApiModelProperty(value = "商品主图地址的数组", required = true, example = "http://www.iocoder.cn")
+    private List<String> picUrls;
+
+    // ========== SKU =========
+
+    /**
+     * SKU 数组
+     */
+    private List<UsersProductSkuDetailVO> skus;
+
+}
--- a/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java
+++ b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.mall.product.application.vo.users;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "商品 SPU VO", description = "不包括 SKU 信息 VO")
+@Data
+@Accessors(chain = true)
+public class UsersProductSpuVO {
+
+    @ApiModelProperty(value = "SPU 编号", required = true, example = "1")
+    private Integer id;
+
+    // ========== 基本信息 =========
+    @ApiModelProperty(value = "SPU 名字", required = true, example = "厮大牛逼")
+    private String name;
+    @ApiModelProperty(value = "卖点", required = true, example = "各种 MQ 骚操作")
+    private String sellPoint;
+    @ApiModelProperty(value = "分类编号", required = true, example = "反正我是信了")
+    private Integer cid;
+    @ApiModelProperty(value = "商品主图地址的数组", required = true, example = "http://www.iocoder.cn")
+    private List<String> picUrls;
+
+    // ========== Sku 相关字段 =========
+    /**
+     * 价格
+     *
+     * 目前的计算方式是，以 Sku 最小价格为准
+     */
+    private Integer price;
+    /**
+     * 库存数量
+     *
+     * 目前的计算方式是，以 Sku 库存累加为准
+     */
+    private Integer quantity;
+
+}