修改商品字段备注

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java

@@ -11,6 +11,7 @@ import com.wzj.soopin.goods.domain.vo.BrandVO;
 import com.wzj.soopin.goods.service.impl.BrandServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.log.annotation.Log;
@@ -27,7 +28,7 @@ import java.util.List;
  * @author zcc
  * @date 2022-11-28
  */
-@Api(description ="品牌管理接口列表")
+@Tag(name ="品牌管理接口列表")
 @RestController
 @RequestMapping("/pms/brand")
 public class BrandController extends BaseController {
@@ -37,14 +38,14 @@ public class BrandController extends BaseController {
     private BrandConvert convert;
 
 
-    @ApiOperation("所有品牌管理列表")
+    @Tag(name ="所有品牌管理列表")
     @PostMapping("list")
     public R<Page<BrandVO>> list(@RequestBody BrandBo query, Page<Brand> page) {
         Page<Brand> brandPage = service.page(page,query.toWrapper());
         return R.ok(convert.toVO(brandPage));
     }
 
-    @ApiOperation("导出品牌管理列表")
+    @Tag(name ="导出品牌管理列表")
     @Log(title = "品牌管理", businessType = BusinessType.EXPORT)
     @GetMapping("export")
     public ResponseEntity<String> export(BrandBo query) {
@@ -53,27 +54,27 @@ public class BrandController extends BaseController {
         return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "品牌管理数据"));
     }
 
-    @ApiOperation("获取品牌管理详细信息")
+    @Tag(name ="获取品牌管理详细信息")
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {
         return R.ok(service.getById(id));
     }
 
-    @ApiOperation("新增品牌管理")
+    @Tag(name ="新增品牌管理")
     @Log(title = "品牌管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public R add(@RequestBody Brand brand) {
         return R.ok(service.save(brand));
     }
 
-    @ApiOperation("修改品牌管理")
+    @Tag(name ="修改品牌管理")
     @Log(title = "品牌管理", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public R edit(@RequestBody Brand brand) {
         return R.ok(service.updateById(brand));
     }
 
-    @ApiOperation("删除品牌管理")
+    @Tag(name ="删除品牌管理")
     @Log(title = "品牌管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{id}")
     public R remove(@PathVariable Long id) {

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java

@@ -12,6 +12,7 @@ import com.wzj.soopin.goods.domain.vo.ProductCategoryVO;
 import com.wzj.soopin.goods.service.impl.ProductCategoryServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
@@ -28,7 +29,7 @@ import java.util.List;
  * @author zcc
  * @date 2022-11-28
  */
-@Api(description ="商品分类接口列表")
+@Tag(name ="商品分类接口列表")
 @RestController
 @RequestMapping("/pms/productCategory")
 public class ProductCategoryController extends BaseController {
@@ -37,34 +38,34 @@ public class ProductCategoryController extends BaseController {
     @Autowired
     private ProductCategoryConvert convert;
 
-    @ApiOperation("查询商品分类列表")
+    @Tag(name ="查询商品分类列表")
     @PostMapping("list")
     public R<Page<ProductCategoryVO>> list(@RequestBody ProductCategoryBo query, Page<ProductCategory> page) {
         Page<ProductCategory> productCategoryPage = service.page(page,query.toWrapper());
         return R.ok(convert.toVO(productCategoryPage));
     }
 
-    @ApiOperation("获取商品分类详细信息")
+    @Tag(name ="获取商品分类详细信息")
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {
         return R.ok(service.getById(id));
     }
 
-    @ApiOperation("新增商品分类")
+    @Tag(name ="获取商品分类详细信息")
     @Log(title = "商品分类", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public R add(@RequestBody ProductCategory productCategory) {
         return R.ok(service.save(productCategory));
     }
 
-    @ApiOperation("修改商品分类")
+    @Tag(name ="修改商品分类")
     @Log(title = "商品分类", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public R edit(@RequestBody ProductCategory productCategory) {
         return R.ok(service.updateById(productCategory));
     }
 
-    @ApiOperation("删除商品分类")
+    @Tag(name ="删除商品分类")
     @Log(title = "商品分类", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{id}")
     public R remove(@PathVariable Long id) {

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java

@@ -16,6 +16,7 @@ import com.wzj.soopin.goods.domain.vo.ProductVO;
 import com.wzj.soopin.goods.service.impl.ProductServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.log.annotation.Log;
@@ -32,7 +33,7 @@ import java.util.List;
  * @author zcc
  * @date 2022-11-28
  */
-@Api(description ="商品信息接口列表")
+@Tag(name ="商品信息接口列表")
 @RestController
 @RequestMapping("/pms/product")
 public class ProductController extends BaseController {
@@ -41,7 +42,7 @@ public class ProductController extends BaseController {
     @Autowired
     private ProductConvert convert;
 
-    @ApiOperation("查询商品信息列表")
+    @Tag(name ="查询商品信息列表")
     @PostMapping("list")
     public R<Page<ProductVO>> list(@RequestBody ProductBo query, Page<Product> page) {
         Page<Product> productPage = service.page(page,query.toWrapper());
@@ -49,7 +50,7 @@ public class ProductController extends BaseController {
     }
 
 
-    @ApiOperation("导出商品信息列表")
+    @Tag(name ="导出商品信息列表")
     @Log(title = "商品信息", businessType = BusinessType.EXPORT)
     @GetMapping("export")
     public ResponseEntity<String> export(ProductBo query) {
@@ -59,27 +60,27 @@ public class ProductController extends BaseController {
     }
 
 
-    @ApiOperation("获取商品信息详细信息")
+    @Tag(name ="获取商品信息详细信息")
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {
         return R.ok(service.getById(id));
     }
 
-    @ApiOperation("新增商品信息")
+    @Tag(name ="新增商品信息")
     @Log(title = "商品信息", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public R add(@RequestBody Product product) {
         return R.ok(service.save(product));
     }
 
-    @ApiOperation("修改商品信息")
+    @Tag(name ="修改商品信息")
     @Log(title = "商品信息", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public R edit(@RequestBody Product product) {
         return R.ok(service.updateById(product));
     }
 
-    @ApiOperation("删除商品信息")
+    @Tag(name ="删除商品信息")
     @Log(title = "商品信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{id}")
     public R remove(@PathVariable Long id) {

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java

@@ -12,6 +12,7 @@ import com.wzj.soopin.goods.domain.vo.SkuVO;
 import com.wzj.soopin.goods.service.impl.SkuServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.log.annotation.Log;
@@ -28,7 +29,7 @@ import java.util.List;
  * @author zcc
  * @date 2022-11-28
  */
-@Api(description ="sku信息接口列表")
+@Tag(name ="sku信息接口列表")
 @RestController
 @RequestMapping("/pms/sku")
 public class SkuController extends BaseController {
@@ -38,7 +39,7 @@ public class SkuController extends BaseController {
     private SkuConvert convert;
 
 
-    @ApiOperation("查询商品信息列表")
+    @Tag(name ="查询商品信息列表")
     @PostMapping("list")
     public R<Page<SkuVO>> list(@RequestBody SkuBo query, Page<Sku> page) {
         Page<Sku> skuPage = service.page(page,query.toWrapper());
@@ -46,7 +47,7 @@ public class SkuController extends BaseController {
     }
 
 
-    @ApiOperation("导出sku信息列表")
+    @Tag(name ="导出sku信息列表")
     @Log(title = "sku信息", businessType = BusinessType.EXPORT)
     @GetMapping("export")
     public ResponseEntity<String> export(SkuBo query) {
@@ -55,27 +56,27 @@ public class SkuController extends BaseController {
         return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "sku信息数据"));
     }
 
-    @ApiOperation("获取sku信息详细信息")
+    @Tag(name ="获取sku信息详细信息")
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {
         return R.ok(service.getById(id));
     }
 
-    @ApiOperation("新增sku信息")
+    @Tag(name ="新增sku信息")
     @Log(title = "sku信息", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public R add(@RequestBody Sku sku) {
        return R.ok(service.save(sku));
     }
 
-    @ApiOperation("修改sku信息")
+    @Tag(name ="修改sku信息")
     @Log(title = "sku信息", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public R edit(@RequestBody Sku sku) {
         return R.ok(service.updateById(sku));
     }
 
-    @ApiOperation("删除sku信息")
+    @Tag(name ="删除sku信息")
     @Log(title = "sku信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{id}")
     public R remove(@PathVariable Long id) {

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/BrandVO.java

@@ -1,6 +1,6 @@
 package com.wzj.soopin.goods.domain.vo;
 
-
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
 import org.dromara.common.excel.annotation.Excel;
@@ -10,20 +10,30 @@ import org.dromara.common.excel.annotation.Excel;
  *
  * @author zcc
  */
+@Schema(description = "品牌管理数据视图对象")
 @Data
 public class BrandVO extends BaseAudit {
-   /** ID */
+    /** ID */
+    @Schema(description = "ID")
     private Long id;
-   /** NAME */
+
+    /** NAME */
+    @Schema(description = "NAME")
     @Excel(name = "NAME")
     private String name;
-   /** SORT */
+
+    /** SORT */
+    @Schema(description = "SORT")
     @Excel(name = "SORT")
     private Integer sort;
-   /** SHOW_STATUS */
+
+    /** SHOW_STATUS */
+    @Schema(description = "SHOW_STATUS")
     @Excel(name = "SHOW_STATUS")
     private Integer showStatus;
-   /** 品牌logo */
+
+    /** 品牌logo */
+    @Schema(description = "品牌logo")
     @Excel(name = "品牌logo")
     private String logo;
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/H5ProductVO.java

@@ -1,13 +1,22 @@
 package com.wzj.soopin.goods.domain.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
+@Schema(description = "H5端商品数据视图对象")
 @Data
 public class H5ProductVO {
+    @Schema(description = "商品ID")
     private Long id;
+
+    @Schema(description = "商品图片")
     private String pic;
+
+    @Schema(description = "商品名称")
     private String name;
+
+    @Schema(description = "商品价格")
     private BigDecimal price;
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductCategoryVO.java

@@ -1,5 +1,6 @@
 package com.wzj.soopin.goods.domain.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
 
@@ -10,21 +11,37 @@ import java.util.List;
  *
  * @author zcc
  */
+@Schema(description = "商品分类数据视图对象")
 @Data
 public class ProductCategoryVO extends BaseAudit {
-   /** ID */
+    /** ID */
+    @Schema(description = "ID")
     private Long id;
-   /** 上级分类的编号：0表示一级分类 */
+
+    /** 上级分类的编号：0表示一级分类 */
+    @Schema(description = "上级分类的编号：0表示一级分类")
     private Long parentId;
-   /** NAME */
+
+    /** NAME */
+    @Schema(description = "NAME")
     private String name;
-   /** 分类级别：0->1级；1->2级 */
+
+    /** 分类级别：0->1级；1->2级 */
+    @Schema(description = "分类级别：0->1级；1->2级")
     private Integer level;
-   /** 显示状态：0->不显示；1->显示 */
+
+    /** 显示状态：0->不显示；1->显示 */
+    @Schema(description = "显示状态：0->不显示；1->显示")
     private Integer showStatus;
-   /** SORT */
+
+    /** SORT */
+    @Schema(description = "SORT")
     private Integer sort;
-   /** 图标 */
+
+    /** 图标 */
+    @Schema(description = "图标")
     private String icon;
+
+    @Schema(description = "子分类列表")
     private List<ProductCategoryVO> children;
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductDetailVO.java

@@ -3,13 +3,20 @@ package com.wzj.soopin.goods.domain.vo;
 import com.wzj.soopin.goods.domain.entity.Brand;
 import com.wzj.soopin.goods.domain.entity.Product;
 import com.wzj.soopin.goods.domain.entity.Sku;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
+@Schema(description = "商品详情数据视图对象")
 @Data
 public class ProductDetailVO {
+    @Schema(description = "商品基本信息")
     private Product product;
+
+    @Schema(description = "商品SKU列表")
     private List<Sku> skus;
+
+    @Schema(description = "品牌信息")
     private Brand brand;
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java

@@ -1,67 +1,105 @@
 package com.wzj.soopin.goods.domain.vo;
 
 import com.wzj.soopin.goods.domain.entity.Sku;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
 import org.dromara.common.excel.annotation.Excel;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 /**
  * 商品信息 数据视图对象
  *
  * @author zcc
  */
+@Schema(description = "商品信息数据视图对象")
 @Data
 public class ProductVO extends BaseAudit {
-   /** ID */
+    /** ID */
+    @Schema(description = "ID")
     private Long id;
-   /** BRAND_ID */
+
+    /** BRAND_ID */
+    @Schema(description = "BRAND_ID")
     @Excel(name = "BRAND_ID")
     private Long brandId;
-   /** CATEGORY_ID */
+
+    /** CATEGORY_ID */
+    @Schema(description = "CATEGORY_ID")
     @Excel(name = "CATEGORY_ID")
     private Long categoryId;
-   /** 商品编码 */
+
+    /** 商品编码 */
+    @Schema(description = "商品编码")
     @Excel(name = "商品编码")
     private String outProductId;
-   /** NAME */
+
+    /** NAME */
+    @Schema(description = "NAME")
     @Excel(name = "NAME")
     private String name;
-   /** 主图 */
+
+    /** 主图 */
+    @Schema(description = "主图")
     @Excel(name = "主图")
     private String pic;
-   /** 画册图片，连产品图片限制为5张，以逗号分割 */
+
+    /** 画册图片，连产品图片限制为5张，以逗号分割 */
+    @Schema(description = "画册图片，连产品图片限制为5张，以逗号分割")
     @Excel(name = "画册图片，连产品图片限制为5张，以逗号分割")
     private String albumPics;
-   /** 上架状态：0->下架；1->上架 */
+
+    /** 上架状态：0->下架；1->上架 */
+    @Schema(description = "上架状态：0->下架；1->上架")
     @Excel(name = "上架状态：0->下架；1->上架")
     private Integer publishStatus;
-   /** 排序 */
+
+    /** 排序 */
+    @Schema(description = "排序")
     @Excel(name = "排序")
     private Integer sort;
-   /** PRICE */
+
+    /** PRICE */
+    @Schema(description = "PRICE")
     @Excel(name = "PRICE")
     private BigDecimal price;
-   /** 单位 */
+
+    /** 单位 */
+    @Schema(description = "单位")
     @Excel(name = "单位")
     private String unit;
-   /** 商品重量，默认为克 */
+
+    /** 商品重量，默认为克 */
+    @Schema(description = "商品重量，默认为克")
     @Excel(name = "商品重量，默认为克")
     private BigDecimal weight;
-   /** 产品详情网页内容 */
+
+    /** 产品详情网页内容 */
+    @Schema(description = "产品详情网页内容")
     @Excel(name = "产品详情网页内容")
     private String detailHtml;
-   /** 移动端网页详情 */
+
+    /** 移动端网页详情 */
+    @Schema(description = "移动端网页详情")
     @Excel(name = "移动端网页详情")
     private String detailMobileHtml;
-   /** 品牌名称 */
+
+    /** 品牌名称 */
+    @Schema(description = "品牌名称")
     @Excel(name = "品牌名称")
     private String brandName;
-   /** 商品分类名称 */
+
+    /** 商品分类名称 */
+    @Schema(description = "商品分类名称")
     @Excel(name = "商品分类名称")
     private String productCategoryName;
+
+    @Schema(description = "商品销售属性，json格式")
     @Excel(name = "商品销售属性，json格式")
     private String productAttr;
+
+    @Schema(description = "SKU列表")
     private List<Sku> skuList;
 }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/SkuVO.java

@@ -1,35 +1,50 @@
 package com.wzj.soopin.goods.domain.vo;
 
-
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
 import org.dromara.common.excel.annotation.Excel;
 
 import java.math.BigDecimal;
+
 /**
  * sku信息 数据视图对象
  *
  * @author zcc
  */
+@Schema(description = "SKU信息数据视图对象")
 @Data
 public class SkuVO extends BaseAudit {
-   /** ID */
+    /** ID */
+    @Schema(description = "ID")
     private Long id;
-   /** PRODUCT_ID */
+
+    /** PRODUCT_ID */
+    @Schema(description = "PRODUCT_ID")
     @Excel(name = "PRODUCT_ID")
     private Long productId;
-   /** sku编码 */
+
+    /** sku编码 */
+    @Schema(description = "sku编码")
     @Excel(name = "sku编码")
     private String outSkuId;
-   /** PRICE */
+
+    /** PRICE */
+    @Schema(description = "PRICE")
     @Excel(name = "PRICE")
     private BigDecimal price;
-   /** 展示图片 */
+
+    /** 展示图片 */
+    @Schema(description = "展示图片")
     @Excel(name = "展示图片")
     private String pic;
-   /** 商品销售属性，json格式 */
+
+    /** 商品销售属性，json格式 */
+    @Schema(description = "商品销售属性，json格式")
     @Excel(name = "商品销售属性，json格式")
     private String spData;
+
+    @Schema(description = "库存数")
     @Excel(name = "库存数")
     private Integer stock;
 }