From ce4b6a8e4c11a869f5707eef053488c62fb97eed Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 17 六月 2021 14:41:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..3e790a6 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,9 +1,12 @@
package com.panzhihua.common.model.vos.shop;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.Valid;
+import javax.validation.constraints.Digits;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import java.math.BigDecimal;
@@ -25,7 +28,8 @@
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;
@@ -39,9 +43,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