商品模块数据表

ghy-common/src/main/java/com/ghy/common/enums/GoodsStatus.java

@@ -5,8 +5,8 @@ package com.ghy.common.enums;
  */
 public enum GoodsStatus {
 
-    OK("0", "正常"),
+    OK("0", "上架"),
-    DISABLE("1", "停用"),
+    DISABLE("1", "下架"),
     DELETED("2", "删除");;
 
     private final String code;

ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java

@@ -5,6 +5,11 @@ import com.ghy.common.core.domain.BaseEntity;
 
 import java.math.BigDecimal;
 
+/**
+ *  商品
+ *
+ *  @author clunt
+ */
 public class Goods extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -15,13 +20,163 @@ public class Goods extends BaseEntity {
     @Excel(name = "编码")
     private String goodsCode;
 
+    @Excel(name = "店铺id")
+    private Long storeId;
+
     @Excel(name = "名称")
     private String goodsName;
 
     @Excel(name = "价格")
     private BigDecimal goodsPrice;
 
-    /** 状态（0正常 1停用） */
+    /** 岗位排序 */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "商品排序", cellType = Excel.ColumnType.NUMERIC)
+    private String goodsSort;
+
+    /** 状态（0上架 1下架 2删除） */
+    @Excel(name = "状态", readConverterExp = "0=上架,1=下架,2删除")
     private String status;
+
+    @Excel(name = "类别id")
+    private Long goodsCategoryId;
+
+    @Excel(name = "商品位置id")
+    private Long storeLocalId;
+
+    @Excel(name = "商品图片", cellType = Excel.ColumnType.IMAGE)
+    private String goodsImgUrl;
+
+    @Excel(name = "商品标签id")
+    private Long goodsLabelId;
+
+    @Excel(name = "商品库存，-1则表示无限制", cellType = Excel.ColumnType.NUMERIC)
+    private Integer goodsNumber;
+
+    @Excel(name = "描述")
+    private String remark;
+
+    public Long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Long goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public BigDecimal getGoodsPrice() {
+        return goodsPrice;
+    }
+
+    public void setGoodsPrice(BigDecimal goodsPrice) {
+        this.goodsPrice = goodsPrice;
+    }
+
+    public String getGoodsSort() {
+        return goodsSort;
+    }
+
+    public void setGoodsSort(String goodsSort) {
+        this.goodsSort = goodsSort;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Long getGoodsCategoryId() {
+        return goodsCategoryId;
+    }
+
+    public void setGoodsCategoryId(Long goodsCategoryId) {
+        this.goodsCategoryId = goodsCategoryId;
+    }
+
+    public String getGoodsImgUrl() {
+        return goodsImgUrl;
+    }
+
+    public void setGoodsImgUrl(String goodsImgUrl) {
+        this.goodsImgUrl = goodsImgUrl;
+    }
+
+    public Long getGoodsLabelId() {
+        return goodsLabelId;
+    }
+
+    public void setGoodsLabelId(Long goodsLabelId) {
+        this.goodsLabelId = goodsLabelId;
+    }
+
+    public Integer getGoodsNumber() {
+        return goodsNumber;
+    }
+
+    public void setGoodsNumber(Integer goodsNumber) {
+        this.goodsNumber = goodsNumber;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreLocalId() {
+        return storeLocalId;
+    }
+
+    public void setStoreLocalId(Long storeLocalId) {
+        this.storeLocalId = storeLocalId;
+    }
+
+    @Override
+    public String toString() {
+        return "Goods{" +
+                "goodsId=" + goodsId +
+                ", goodsCode='" + goodsCode + '\'' +
+                ", storeId=" + storeId +
+                ", goodsName='" + goodsName + '\'' +
+                ", goodsPrice=" + goodsPrice +
+                ", goodsSort='" + goodsSort + '\'' +
+                ", status='" + status + '\'' +
+                ", goodsCategoryId=" + goodsCategoryId +
+                ", storeLocalId=" + storeLocalId +
+                ", goodsImgUrl='" + goodsImgUrl + '\'' +
+                ", goodsLabelId=" + goodsLabelId +
+                ", goodsNumber=" + goodsNumber +
+                ", remark='" + remark + '\'' +
+                '}';
+    }
 }

ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java

@@ -0,0 +1,27 @@
+package com.ghy.goods.domain;
+
+
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+
+/**
+ *  商品类别表
+ *
+ * @author clunt
+ */
+public class GoodsCategory extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC)
+    private Long goodsCategoryId;
+
+    @Excel(name = "类别编码", cellType = Excel.ColumnType.STRING)
+    private String goodsCategoryCode;
+
+    @Excel(name = "类别名称", cellType = Excel.ColumnType.STRING)
+    private String goodsCategoryName;
+
+
+
+}

ghy-goods/src/main/java/com/ghy/goods/domain/GoodsTag.java

@@ -0,0 +1,13 @@
+package com.ghy.goods.domain;
+
+import com.ghy.common.core.domain.BaseEntity;
+
+/**
+ *  商品标签
+ */
+
+public class GoodsTag extends BaseEntity {
+
+
+
+}