From 054f147c95e54c615090dcb95d7e269d2f43d9a9 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Thu, 24 Dec 2020 20:30:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/youlai/mall/pms/bo/AppProductBO.java | 8 ++++---- .../src/main/java/com/youlai/mall/pms/bo/ProductBO.java | 9 +++++---- .../mall/pms/pojo/{PmsCategoryAttr.java => PmsAttr.java} | 2 +- .../mall/pms/pojo/{PmsCategorySpec.java => PmsSpec.java} | 4 ++-- .../pms/pojo/{PmsSpuAttr.java => PmsSpuAttrValue.java} | 7 +++---- .../pms/pojo/{PmsSpuSpec.java => PmsSpuSpecValue.java} | 6 +++--- .../main/java/com/youlai/mall/pms/pojo/dto/SpuDTO.java | 3 +-- 7 files changed, 19 insertions(+), 20 deletions(-) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/{PmsCategoryAttr.java => PmsAttr.java} (89%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/{PmsCategorySpec.java => PmsSpec.java} (82%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/{PmsSpuAttr.java => PmsSpuAttrValue.java} (80%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/{PmsSpuSpec.java => PmsSpuSpecValue.java} (74%) 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 8e62f6dc..2251df42 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 daf8dec4..2789e799 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 bbde9f9c..2c97ed2f 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 31c2950b..75333870 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 c8dbba23..77bca069 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 b48ecca3..5a0e0eb7 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 cf6ef750..ef13fbc6 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; -- GitLab