From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
index 4169561..98b34a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
@@ -2,10 +2,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -68,10 +70,15 @@
private BigDecimal originalPrice;
/**
- * 商品现价
+ * 包邮价
*/
- @ApiModelProperty("商品现价")
- private BigDecimal price;
+ @ApiModelProperty("包邮价")
+ private BigDecimal freeShippingPrice;
+ /**
+ * 拼单价
+ */
+ @ApiModelProperty("拼单价")
+ private BigDecimal collatePrice;
/**
* 商品单位
@@ -101,7 +108,7 @@
* 配送方式（1.商家配送 2.快递物流）
*/
@ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
- private Integer deliveryType;
+ private String deliveryType;
/**
* 商品规格列表
@@ -126,8 +133,31 @@
private Integer orderNum;
/**
+ * 浏览量
+ */
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+
+ /**
+ * 评价数量
+ */
+ @ApiModelProperty("评价数量")
+ private Integer evaluateNum;
+
+ /**
* 商品规格列表
*/
@ApiModelProperty("评价列表，最新三条")
private List<ComShopFlowerEvaluateVO> shopFlowerEvaluateVOList;
+
+ @ApiModelProperty("商品分类")
+ @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
+ private List<Long> categoryIds;
+
+
+ @ApiModelProperty("商品描述")
+ private String goodsDescribe;
}
+
+
--
Gitblit v1.7.1