diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java b/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java index 4e80b3af..d4ddde5a 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java @@ -1,6 +1,12 @@ package com.czg.service.product.dto; import com.alibaba.fastjson2.annotation.JSONField; +import com.czg.validator.group.DefaultGroup; +import com.czg.validator.group.InsertGroup; +import com.czg.validator.group.UpdateGroup; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Null; import lombok.Data; import java.io.Serializable; @@ -19,33 +25,38 @@ public class ShopProdUnitDTO implements Serializable { /** * id */ - private Integer id; + @Null(message = "ID必须为空}", groups = InsertGroup.class) + @NotNull(message = "ID不能为空", groups = UpdateGroup.class) + private Long id; /** * 单位名称 */ + @NotBlank(message = "单位名称不能为空", groups = DefaultGroup.class) private String name; /** - * 小数位(个数大于0,表示小数据精度位数) - */ - private Integer decimalsDigits; - /** - * 单位类型(weight代表重量,小数单位,为number代表个数) + * 单位类型 number-计数 weight-记重 */ private String unitType; /** - * 0后台添加 -1系统默认 (公斤、瓶) + * 单位来源 1-系统预设 0-商家创建 */ private Integer isSystem; /** - * 预留字段1-正常 + * 状态 0-禁用 1-启用 */ private Integer status; /** - * 店铺Id + * 店铺id */ private String shopId; + /** + * 创建时间 + */ @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + /** + * 更新时间 + */ @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java b/cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java index d1eb25d9..d155314c 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java @@ -27,7 +27,7 @@ public class Product implements Serializable { * id */ @Id(keyType = KeyType.Auto) - private Integer id; + private Long id; /** * 商品分类 */ @@ -35,12 +35,12 @@ public class Product implements Serializable { /** * 商品规格 */ - private Integer specId; + private Long specId; /** * 单位Id */ - private Integer unitId; - private String shopId; + private Long unitId; + private Long shopId; /** * 商品名称 */ diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java b/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java index e32c446a..76393e7d 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java @@ -26,7 +26,7 @@ public class ShopProdCategory implements Serializable { * 自增id */ @Id(keyType = KeyType.Auto) - private Integer id; + private Long id; /** * 分类名称 */ @@ -46,7 +46,7 @@ public class ShopProdCategory implements Serializable { /** * 店铺Id */ - private String shopId; + private Long shopId; /** * 是否显示:1显示 0不显示 */ diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java b/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java index fb78a625..4c76a75b 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java @@ -26,31 +26,33 @@ public class ShopProdUnit implements Serializable { * id */ @Id(keyType = KeyType.Auto) - private Integer id; + private Long id; /** * 单位名称 */ private String name; /** - * 小数位(个数大于0,表示小数据精度位数) - */ - private Integer decimalsDigits; - /** - * 单位类型(weight代表重量,小数单位,为number代表个数) + * 单位类型 number-计数 weight-记重 */ private String unitType; /** - * 0后台添加 -1系统默认 (公斤、瓶) + * 单位来源 1-系统预设 0-商家创建 */ private Integer isSystem; /** - * 预留字段1-正常 + * 状态 0-禁用 1-启用 */ private Integer status; /** - * 店铺Id + * 店铺id */ - private String shopId; + private Long shopId; + /** + * 创建时间 + */ private LocalDateTime createTime; + /** + * 更新时间 + */ private LocalDateTime updateTime; } \ No newline at end of file