From a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 11:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
index ed3d262..7513455 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
@@ -1,13 +1,17 @@
package com.panzhihua.common.model.vos.shop;
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Min;
+
+import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import java.math.BigDecimal;
-import java.util.List;
/**
* @auther llming
@@ -20,18 +24,16 @@
@ApiModelProperty("店铺id")
private Long storeId;
-
@ApiModelProperty("商品名称")
private String name;
@ApiModelProperty("商品现价")
- @Min(value = 0,message = "价格最小值为0")
+ @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
+ @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
private BigDecimal price;
-
@ApiModelProperty("商品单位")
private String unit;
-
@ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
private Integer status;
@@ -39,9 +41,19 @@
@ApiModelProperty("商品主图")
private String goodsPic;
+ @ApiModelProperty("商品图片")
+ private String images;
+
@ApiModelProperty("商品详情")
private String details;
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty(value = "配送方式（1.商家配送 2.快递物流）", hidden = true)
+ private Integer deliveryType;
+
@ApiModelProperty("商品规格")
+ @Valid
private List<AddShopGoodsAttrVO> goodsAttrVOList;
}
--
Gitblit v1.7.1