From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
index 2a6e9a6..43da3e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -23,7 +23,7 @@
/**
* 商品id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -34,6 +34,7 @@
/**
* 商品名称
*/
+ @TableField("`name`")
private String name;
/**
@@ -52,8 +53,9 @@
private String images;
/**
- * 商品状态(1.出售中 2.已下架 3.回收站)
+ * 商品状态(1.出售中 2.已下架 3.回收站)
*/
+ @TableField("`status`")
private Integer status;
/**
@@ -79,6 +81,7 @@
/**
* 商品排序
*/
+ @TableField("`order`")
private Integer order;
/**
@@ -102,12 +105,12 @@
private String goodsDescribe;
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
private Integer deliveryType;
/**
- * 删除状态（1.未删除 2.已删除）
+ * 删除状态（1.未删除 2.已删除）
*/
private Integer deleteStatus;
@@ -125,27 +128,36 @@
@Override
public String toString() {
- return "ComShopGoodsDO{" +
- "id=" + id +
- ", typeId=" + typeId +
- ", name=" + name +
- ", storeId=" + storeId +
- ", goodsPic=" + goodsPic +
- ", images=" + images +
- ", status=" + status +
- ", sale=" + sale +
- ", originalPrice=" + originalPrice +
- ", price=" + price +
- ", unit=" + unit +
- ", order=" + order +
- ", stock=" + stock +
- ", details=" + details +
- ", remark=" + remark +
- ", goodsDescribe=" + goodsDescribe +
- ", deliveryType=" + deliveryType +
- ", deleteStatus=" + deleteStatus +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
+ return "ComShopGoodsDO{" + "id=" + id + ", typeId=" + typeId + ", name=" + name + ", storeId=" + storeId
+ + ", goodsPic=" + goodsPic + ", images=" + images + ", status=" + status + ", sale=" + sale
+ + ", originalPrice=" + originalPrice + ", price=" + price + ", unit=" + unit + ", order=" + order
+ + ", stock=" + stock + ", details=" + details + ", remark=" + remark + ", goodsDescribe=" + goodsDescribe
+ + ", deliveryType=" + deliveryType + ", deleteStatus=" + deleteStatus + ", createAt=" + createAt
+ + ", updateAt=" + updateAt + "}";
+ }
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.回收站)
+ */
+ public interface status {
+ int sell = 1;
+ int lower = 2;
+ int recovery = 3;
+ }
+
+ /**
+ * 删除状态（1.未删除 2.已删除）
+ */
+ public interface deleteStatus {
+ int no = 1;
+ int yes = 2;
+ }
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ public interface deliveryType {
+ int store = 1;
+ int express = 2;
}
}
\ No newline at end of file
--
Gitblit v1.7.1