新增注释

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -74,6 +74,7 @@ public class KwpGoodsController {
      * @Param id:
      * @return: com.sckw.core.web.response.HttpResult
      */
+    @Operation(summary = "商品详情", description = "商品详情信息")
     @GetMapping("/detail")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok(kwpGoodsService.getDetail(id));
@@ -86,6 +87,7 @@ public class KwpGoodsController {
      * @Param updateGoodsParam:
      * @return: com.sckw.core.web.response.HttpResult
      */
+    @Operation(summary = "修改商品", description = "根据id修改商品")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     public HttpResult update(@RequestBody @Validated UpdateGoodsParam updateGoodsParam) {
@@ -101,6 +103,7 @@ public class KwpGoodsController {
      * @Param params:
      * @return: com.sckw.core.web.response.HttpResult
      */
+    @Operation(summary = "分页查询商品列表", description = "根据条件分页查询钱包明细信息")
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult select(@RequestBody SelectGoodsListParam params) {
         return HttpResult.ok(kwpGoodsService.select(params));

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -89,8 +89,8 @@ public class AddGoodsParam {
      * 参考价格（元）
      */
     @Schema(description = "参考价格（元）")
-    @Positive(message = "金额必须大于0！")
-    @Digits(integer = 9, fraction = 5, message = "金额最多9位整数和5位小数！")
+    @Positive(message = "参考价格必须大于0！")
+    @Digits(integer = 9, fraction = 5, message = "参考价格最多9位整数和5位小数！")
     private BigDecimal price;
 
     /**
@@ -141,6 +141,7 @@ public class AddGoodsParam {
      * 辅助单位
      */
     @Schema(description = "辅助单位")
+    @Valid
     private List<GoodsUnitParam> assistUnit;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsAttributes.java

@@ -20,16 +20,16 @@ public class GoodsAttributes {
     /**
      * 参数名称
      */
-    @Schema(description = "供应商企业id")
+    @Schema(description = "参数名称")
     @Length(max = 10,message = "参数名称最长10字符")
-    @Pattern(regexp = "^[^\\s]*$", message = "商品名称不允许包含空格！")
+    @Pattern(regexp = "^[^\\s]*$", message = "参数名称不允许包含空格！")
     private String name;
 
     /**
      * 参数值
      */
-    @Schema(description = "供应商企业id")
-    @Length(max = 20,message = "参数值最长20字符")
-    @Pattern(regexp = "^[^\\s]*$", message = "商品名称不允许包含空格！")
+    @Schema(description = "参数内容")
+    @Length(max = 20,message = "参数内容最长20字符")
+    @Pattern(regexp = "^[^\\s]*$", message = "参数内容不允许包含空格！")
     private String val;
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsUnitParam.java

@@ -1,6 +1,5 @@
 package com.sckw.product.model.vo.req;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Digits;
 import jakarta.validation.constraints.Positive;
 import lombok.Data;
@@ -22,20 +21,17 @@ public class GoodsUnitParam implements Serializable {
     /**
      * 被转换单位
      */
-    @Schema(description = "被转换单位")
     private String fromUnit;
 
     /**
      * 转换目标单位
      */
-    @Schema(description = "转换目标单位")
     private String toUnit;
 
     /**
      * 换算值
      */
-    @Schema(description = "换算值")
-    @Positive(message = "金额必须大于0！")
-    @Digits(integer = 9, fraction = 5, message = "金额最多9位整数和5位小数！")
+    @Positive(message = "单位换算值必须大于0！")
+    @Digits(integer = 8, fraction = 2, message = "单位换算值最多8位整数和2位小数！")
     private Double conversionValue;
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/SelectGoodsListParam.java

@@ -1,5 +1,6 @@
 package com.sckw.product.model.vo.req;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -26,6 +27,7 @@ public class SelectGoodsListParam extends StatisticGoodsListParam {
     /**
      * 状态
      */
+    @Schema(description = "状态")
     private Integer status;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/StatisticGoodsListParam.java

@@ -1,6 +1,7 @@
 package com.sckw.product.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,33 +22,39 @@ public class StatisticGoodsListParam {
     /**
      * 模糊匹配商品名称、仓储地址、客户经理
      */
+    @Schema(description = "模糊匹配值")
     private String keywords;
 
     /**
      * 创建时间开始（yyyy-MM-dd HH:mm:ss）
      */
+    @Schema(description = "创建时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startCreateTime;
 
     /**
      * 创建时间结束（yyyy-MM-dd HH:mm:ss）
      */
+    @Schema(description = "创建时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endCreateTime;
 
     /**
      * 商品类型
      */
+    @Schema(description = "商品类型")
     private String goodsType;
 
     /**
      * 商品类型type值
      */
+    @Schema(description = "商品类型type值")
     private String goodsTypeValue;
 
     /**
      * 供应单位id
      */
+    @Schema(description = "供应单位id")
     private Long supplyEntId;
 
     /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/UpdateGoodsParam.java

@@ -89,8 +89,8 @@ public class UpdateGoodsParam {
      * 参考价格（元）
      */
     @Schema(description = "参考价格（元）")
-    @Positive(message = "金额必须大于0！")
-    @Digits(integer = 9, fraction = 5, message = "金额最多9位整数和5位小数！")
+    @Positive(message = "参考价格必须大于0！")
+    @Digits(integer = 9, fraction = 5, message = "参考价格最多9位整数和5位小数！")
     private BigDecimal price;
 
     /**
@@ -137,6 +137,7 @@ public class UpdateGoodsParam {
      * 辅助单位
      */
     @Schema(description = "辅助单位")
+    @Valid
     private List<GoodsUnitParam> assistUnit;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsDetail.java

@@ -1,6 +1,7 @@
 package com.sckw.product.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,193 +25,231 @@ public class GoodsDetail {
     /**
      * 商品id
      */
+    @Schema(description = "商品id")
     private Long id;
 
     /**
      * 企业id
      */
+    @Schema(description = "企业id")
     private Long entId;
 
     /**
      * 企业名称
      */
+    @Schema(description = "企业名称")
     private String ent;
 
     /**
      * 企业头像
      */
+    @Schema(description = "企业头像")
     private String entHead;
 
     /**
      * 企业主营范围
      */
+    @Schema(description = "企业主营范围")
     private String entBusiness;
 
     /**
      * 企业地址
      */
+    @Schema(description = "企业地址")
     private String entAddress;
 
     /**
      * 供应单位id
      */
+    @Schema(description = "供应单位id")
     private Long supplyEntId;
 
     /**
      * 供应单位名称
      */
+    @Schema(description = "供应单位名称")
     private String supplyEnt;
 
     /**
      * 商品编号
      */
+    @Schema(description = "商品编号")
     private String code;
 
     /**
      * 商品名称
      */
+    @Schema(description = "商品名称")
     private String name;
 
     /**
      * 商品类型
      */
+    @Schema(description = "商品类型")
     private String goodsType;
 
     /**
      * 商品类型集合
      */
+    @Schema(description = "商品类型集合")
     private List<String> goodsTypes;
 
     /**
      * 商品类型lab
      */
+    @Schema(description = "商品类型lab")
     private String goodsTypeLabel;
 
     /**
      * 商品类型labs
      */
+    @Schema(description = "商品类型labs")
     private String goodsTypeLabels;
 
     /**
      * 库存数量
      */
+    @Schema(description = "库存数量")
     private BigDecimal amount;
 
     /**
      * 价格单位
      */
+    @Schema(description = "价格单位")
     private String priceUnit;
 
     /**
      * 轴数id(逗号隔开)
      */
+    @Schema(description = "轴数id")
     private String carAxis;
 
     /**
      * 轴数(逗号隔开)
      */
+    @Schema(description = "轴数(逗号隔开)")
     private String carAxisName;
 
     /**
      * 富文本内容
      */
+    @Schema(description = "富文本内容")
     private String content;
 
     /**
      * 参考价格
      */
+    @Schema(description = "参考价格")
     private BigDecimal price;
 
     /**
      * 单位（吨、方、件、箱、其他）
      */
+    @Schema(description = "单位（吨、方、件、箱、其他）")
     private String unit;
 
     /**
      * 单位lab
      */
+    @Schema(description = "单位lab")
     private String unitLabel;
 
     /**
      * 尺寸大小
      */
+    @Schema(description = "尺寸大小")
     private String spec;
 
     /**
      * 预付款最低限额
      */
+    @Schema(description = "预付款最低限额")
     private BigDecimal advancePrice;
 
     /**
      * 专属客户经理id
      */
+    @Schema(description = "专属客户经理id")
     private Long manager;
 
     /**
      * 专属客户经理姓名
      */
+    @Schema(description = "专属客户经理姓名")
     private String managerName;
 
     /**
      * 成交量
      */
+    @Schema(description = "成交量")
     private BigDecimal performedAmount;
 
     /**
      * 缩略图
      */
+    @Schema(description = "缩略图")
     private String thumb;
 
     /**
      * 上架时间
      */
+    @Schema(description = "上架时间")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date addedTime;
 
     /**
      * 下架时间
      */
+    @Schema(description = "下架时间")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shelfTime;
 
     /**
      * 备注
      */
+    @Schema(description = "备注")
     private String remark;
 
     /**
      * 状态:0草稿/1上架/2下架
      */
+    @Schema(description = "状态:0草稿/1上架/2下架")
     private Integer status;
 
     /**
      * 状态label
      */
+    @Schema(description = "状态label")
     private String statusLabel;
 
     /**
      * 商品详情图片
      */
+    @Schema(description = "商品详情图片")
     private List<GoodsImagesDetail> images;
 
     /**
      * 地址信息
      */
+    @Schema(description = "地址信息")
     private AddressInfoDetail addressInfo;
 
     /**
      * 参数目录
      */
+    @Schema(description = "参数目录")
     private List<GoodsAttributesDetail> attributes;
 
     /**
      * 推荐商品
      */
+    @Schema(description = "推荐商品")
     private List<RecommendGoods> recommendGoodsList;
 
     /**
      * 辅助单位
      */
+    @Schema(description = "辅助单位")
     private List<GoodsUnitDetail> assistUnit;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsList.java

@@ -1,6 +1,7 @@
 package com.sckw.product.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,126 +24,150 @@ public class GoodsList {
     /**
      * 商品id
      */
+    @Schema(description = "商品id")
     private Long id;
 
     /**
      * 商品编号
      */
+    @Schema(description = "商品编号")
     private String code;
 
     /**
      * 状态:0草稿/1上架/2下架
      */
+    @Schema(description = "状态:0草稿/1上架/2下架")
     private Integer status;
 
     /**
      * 状态label
      */
+    @Schema(description = "状态label")
     private String statusLabel;
 
     /**
      * 商品名称
      */
+    @Schema(description = "商品名称")
     private String name;
 
     /**
      * 商品缩略图
      */
+    @Schema(description = "商品缩略图")
     private String thumb;
 
     /**
      * 商品类型
      */
+    @Schema(description = "商品类型")
     private String goodsType;
 
     /**
      * 商品类型Label
      */
+    @Schema(description = "商品类型Label")
     private String goodsTypeLabel;
 
     /**
      * 计量单位（吨、方、件、箱、其他）
      */
+    @Schema(description = "计量单位（吨、方、件、箱、其他）")
     private String unit;
 
     /**
      * 计量单位lab
      */
+    @Schema(description = "计量单位lab")
     private String unitLabel;
 
     /**
      * 尺寸大小
      */
+    @Schema(description = "尺寸大小")
     private String spec;
 
     /**
      * 库存数量
      */
+    @Schema(description = "库存数量")
     private BigDecimal amount;
 
 
     /**
      * 仓储地址
      */
+    @Schema(description = "仓储地址")
     private String address;
 
     /**
      * 客户经理
      */
+    @Schema(description = "客户经理")
     private String manageName;
 
 
     /**
      * 上架时间
      */
+    @Schema(description = "上架时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date addedTime;
 
     /**
      * 下架时间
      */
+    @Schema(description = "下架时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shelfTime;
 
     /**
      * 供应企业
      */
+    @Schema(description = "供应企业")
     private String supplyEnt;
 
     /**
      * 创建人
      */
+    @Schema(description = "创建人")
     private String createByName;
 
     /**
      * 创建时间
      */
+    @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 备注
      */
+    @Schema(description = "备注")
     private String remark;
 
     /**
      * 价格单位
      */
+    @Schema(description = "价格单位")
     private String priceUnit;
 
     /**
      * 轴数
      */
+    @Schema(description = "轴数")
     private String carAxis;
 
     /**
      * 富文本内容
      */
+    @Schema(description = "富文本内容")
     private String content;
 
     /**
      * 参考价格
      */
+    @Schema(description = "参考价格")
     private BigDecimal price;
 
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsUnitDetail.java

@@ -1,5 +1,6 @@
 package com.sckw.product.model.vo.res;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
@@ -18,25 +19,30 @@ public class GoodsUnitDetail implements Serializable {
     /**
      * 被转换单位
      */
+    @Schema(description = "被转换单位")
     private String fromUnit;
 
     /**
      * 被转换单位
      */
+    @Schema(description = "被转换单位名称")
     private String fromUnitName;
 
     /**
      * 转换目标单位
      */
+    @Schema(description = "转换目标单位")
     private String toUnit;
 
     /**
      * 转换目标单位
      */
+    @Schema(description = "转换目标单位")
     private String toUnitName;
 
     /**
      * 换算值
      */
+    @Schema(description = "换算值")
     private Double conversionValue;
 }