~entity;

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsSkuSpecValue.java

@@ -34,14 +34,14 @@ public class GoblinGoodsSkuSpecValue implements Serializable {
     private String skuId;
 
     /**
-     * 规格id，对应 goblin_goods_spec.spec_id
+     * 规格名称，对应 goblin_goods_spec.spec_name
      */
-    private String specId;
+    private String specName;
 
     /**
-     * 规格值id，对应 goblin_goods_spec_value.spec_vid
+     * 规格值名称，对应 goblin_goods_spec_value.spec_vname
      */
-    private String specVid;
+    private String specVname;
 
     /**
      * 排序，数值越小排序越前

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsSpec.java

@@ -24,11 +24,6 @@ public class GoblinGoodsSpec implements Serializable {
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
 
-    /**
-     * 规格id
-     */
-    private String specId;
-
     /**
      * 规格名称
      */
@@ -52,10 +47,6 @@ public class GoblinGoodsSpec implements Serializable {
 
     private LocalDateTime updatedAt;
 
-    private String deletedBy;
-
-    private LocalDateTime deletedAt;
-
     private String comment;
 
 

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsSpecValue.java

@@ -26,14 +26,9 @@ public class GoblinGoodsSpecValue implements Serializable {
     private Long mid;
 
     /**
-     * 规格id，对应 goblin_goods_spec.spec_id
+     * 规格名称，对应 goblin_goods_spec.spec_name
      */
-    private String specId;
-
-    /**
-     * 规格值id
-     */
-    private String specVid;
+    private String specName;
 
     /**
      * 规格值的名称
@@ -53,10 +48,6 @@ public class GoblinGoodsSpecValue implements Serializable {
 
     private LocalDateTime updatedAt;
 
-    private String deletedBy;
-
-    private LocalDateTime deletedAt;
-
     private String comment;
 
 

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsSpuSpecValue.java

@@ -29,12 +29,12 @@ public class GoblinGoodsSpuSpecValue implements Serializable {
     private String spuId;
 
     /**
-     * 规格id，对应 goblin_goods_spec.spec_id
+     * 规格名称，对应 goblin_goods_spec.spec_name
      */
     private String specId;
 
     /**
-     * 规格值id，对应 goblin_goods_spec_value.spec_vid
+     * 规格值名称，对应 goblin_goods_spec_value.spec_vname
      */
     private String specVid;
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -373,8 +373,8 @@ create table goblin_goods_spu_spec_value
 (
     mid      bigint auto_increment primary key,
     spu_id   varchar(64) not null comment '商品id，对应 goblin_goods.spu_id',
-    spec_id  varchar(30) not null comment '规格id，对应 goblin_goods_spec.spec_id',
-    spec_vid varchar(30) not null comment '规格值id，对应 goblin_goods_spec_value.spec_vid',
+    spec_name  varchar(30) not null comment '规格，对应 goblin_goods_spec.spec_name',
+    spec_vname varchar(30) not null comment '规格值，对应 goblin_goods_spec_value.spec_vname',
     sort     int  default 0 comment '排序，数值越小排序越前',
     del_flg  char default '0' comment '删除标记[0-未删除|1-删除]',
     comment  varchar(255)
@@ -388,66 +388,61 @@ create table goblin_goods_sku_spec_value
     mid      bigint auto_increment primary key,
     spu_id   varchar(64) not null comment '商品id，对应 goblin_goods.spu_id',
     sku_id   varchar(64) not null comment '单品id，对应 goblin_goods_sku.sku_id',
-    spec_id  varchar(30) not null comment '规格id，对应 goblin_goods_spec.spec_id',
-    spec_vid varchar(30) not null comment '规格值id，对应 goblin_goods_spec_value.spec_vid',
+    spec_name  varchar(30) not null comment '规格名称，对应 goblin_goods_spec.spec_name',
+    spec_vname varchar(30) not null comment '规格值名称，对应 goblin_goods_spec_value.spec_vname',
     sort     int  default 0 comment '排序，数值越小排序越前',
     del_flg  char default '0' comment '删除标记[0-未删除|1-删除]',
     comment  varchar(255)
 ) engine = InnoDB comment '单品关联规格值';
 
 create index idx_ggssv_sku_id on goblin_goods_sku_spec_value (sku_id);
-create index idx_ggssv_spec_id on goblin_goods_sku_spec_value (spec_id);
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------
 drop table if exists goblin_goods_spec_value;
 create table goblin_goods_spec_value
 (
     mid        bigint auto_increment primary key,
-    spec_id    varchar(30)  not null comment '规格id，对应 goblin_goods_spec.spec_id',
-    spec_vid   varchar(30)  not null comment '规格值id',
-    spec_vname varchar(128) not null comment '规格值的名称',
+    spec_name    varchar(30)  not null comment '规格名称，对应 goblin_goods_spec.spec_name',
+#     spec_vid   varchar(30)  not null comment '规格值id',
+    spec_vname varchar(90) not null comment '规格值名称',
     del_flg    char default '0' comment '删除标记[0-未删除|1-删除]',
     created_by varchar(64)  not null,
     created_at datetime     not null,
     updated_by varchar(64)  null,
     updated_at datetime     null,
-    deleted_by varchar(64)  null,
-    deleted_at datetime     null,
     comment    varchar(255)
 ) engine = InnoDB comment '商品规格值';
 
-create index idx_ggsv_spec_vid on goblin_goods_spec_value (spec_vid);
+create unique index uidx_ggsv_s_s on goblin_goods_spec_value (spec_name, spec_vname);
 # -- >>------------------------------------------------------------------------------------
 drop table if exists goblin_goods_spec;
 create table goblin_goods_spec
 (
     mid        bigint auto_increment primary key,
-    spec_id    varchar(30) not null comment '规格id',
+#     spec_id    varchar(30) not null comment '规格id',
     spec_name  varchar(45) not null comment '规格名称',
-    spec_alias varchar(45) null comment '规格别名',
+    spec_alias varchar(100) null comment '规格别名',
     del_flg    char default '0' comment '删除标记[0-未删除|1-删除]',
     created_by varchar(64) not null,
     created_at datetime    not null,
     updated_by varchar(64) null,
     updated_at datetime    null,
-    deleted_by varchar(64) null,
-    deleted_at datetime    null,
     comment    varchar(255)
 ) charset = utf8 comment '商品规格';
 
-create unique index uidx_ggs_spec_id on goblin_goods_spec (spec_id);
+create unique index uidx_ggs_spec_id on goblin_goods_spec (spec_name);
 # -- >>------------------------------------------------------------------------------------
 drop table if exists goblin_goods_category_spec;
 create table goblin_goods_category_spec
 (
     mid     bigint auto_increment primary key,
     cate_id varchar(30) not null comment '分类id，对应 goblin_self_goods_category.cate_id',
-    spec_id varchar(30) not null comment '规格id，对应 goblin_goods_spec.spec_id',
+    spec_name varchar(30) not null comment '规格名称，对应 goblin_goods_spec.spec_name',
     del_flg char default '0' comment '删除标记[0-未删除|1-删除',
     comment varchar(255)
 ) engine = InnoDB comment '分类关联规格';
 
-create index idx_ggcs_cate_id on goblin_goods_category_spec (cate_id);
+create unique index uidx_ggcs_c_s on goblin_goods_category_spec (cate_id, spec_name);
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------