diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/AppProductBO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/AppProductBO.java index 8e62f6dc1cf395a8eecd07d7d8bf4d5de8a638b5..2251df4245029542cf135c52ff0a448dbd4c640a 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/AppProductBO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/AppProductBO.java @@ -1,7 +1,7 @@ package com.youlai.mall.pms.bo; -import com.youlai.mall.pms.pojo.PmsSpuAttr; -import com.youlai.mall.pms.pojo.PmsCategorySpec; +import com.youlai.mall.pms.pojo.PmsSpuAttrValue; +import com.youlai.mall.pms.pojo.PmsSpec; import com.youlai.mall.pms.pojo.dto.SkuDTO; import com.youlai.mall.pms.pojo.dto.SpuDTO; import lombok.AllArgsConstructor; @@ -19,8 +19,8 @@ public class AppProductBO { private List skuList; - private List attributes; + private List attributes; - private List specifications; + private List specifications; } diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/ProductBO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/ProductBO.java index daf8dec4b547bdc9c6510e96c253eac2ed1bbb31..2789e799e2face0c22fe8df3e773c6540e7a6fac 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/ProductBO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/ProductBO.java @@ -1,8 +1,9 @@ package com.youlai.mall.pms.bo; import com.youlai.mall.pms.pojo.PmsSku; -import com.youlai.mall.pms.pojo.PmsCategorySpec; -import com.youlai.mall.pms.pojo.PmsSpuAttr; +import com.youlai.mall.pms.pojo.PmsSpec; +import com.youlai.mall.pms.pojo.PmsSpuAttrValue; +import com.youlai.mall.pms.pojo.PmsSpuSpecValue; import com.youlai.mall.pms.pojo.dto.SpuDTO; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,9 +18,9 @@ public class ProductBO { private SpuDTO spu; - private List attributes; + private List attrs; - private List specifications; + private List specs; private List skuList; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategoryAttr.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsAttr.java similarity index 89% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategoryAttr.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsAttr.java index bbde9f9c40d69d61dfa82d8703aa1b85cdab6237..2c97ed2f1af9de5076310f0f1d999015c2f83c3d 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategoryAttr.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsAttr.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @Data -public class PmsCategoryAttr { +public class PmsAttr { @TableId(type=IdType.AUTO) private Long id; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategorySpec.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpec.java similarity index 82% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategorySpec.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpec.java index 31c2950b8ed3c8b73c017f82579493c6f9823ffd..75333870a7b6881146e8c412866ef12a7592312b 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategorySpec.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpec.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; @Data -public class PmsCategorySpec { +public class PmsSpec { @TableId(type = IdType.AUTO) private Long id; @@ -17,6 +17,6 @@ public class PmsCategorySpec { private String name; @TableField(exist = false) - private List values = new ArrayList<>(); + private List values = new ArrayList<>(); } diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttr.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttrValue.java similarity index 80% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttr.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttrValue.java index c8dbba23be8e263fb8741311fd26905b49e736de..77bca0692546008d2e115ce333c03bd16aeb8b8e 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttr.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttrValue.java @@ -11,14 +11,13 @@ import lombok.Data; * @date 2020-11-06 */ @Data -public class PmsSpuAttr extends BaseEntity { +public class PmsSpuAttrValue extends BaseEntity { @TableId(type = IdType.AUTO) private Long id; private Long spuId; - private Long attrCategoryId; + private Long attrId; + private String name; private String value; - @TableField(exist = false) - private String name; } diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpec.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecValue.java similarity index 74% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpec.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecValue.java index b48ecca3ea35bd8c18f7ed59057ea2a2822f08af..5a0e0eb7d7410085bee026c1ada1c19e3367e27e 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpec.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecValue.java @@ -10,11 +10,11 @@ import lombok.Data; * @date 2020-11-06 */ @Data -public class PmsSpuSpec extends BaseEntity { +public class PmsSpuSpecValue extends BaseEntity { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.INPUT) private Long id; private Long spuId; - private Long specCategoryId; + private Long specId; private String value; } diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SpuDTO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SpuDTO.java index cf6ef750e709c22862cba619dd6b71b00c73e087..ef13fbc62dcd2cc6b2a6894a772698fefe23001e 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SpuDTO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SpuDTO.java @@ -13,8 +13,7 @@ public class SpuDTO { private Long brandId; private Long originPrice; private Long price; - private String pic; - private List pics; + private List picUrls; private String unit; private String description; private String detail;