From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 18:32:03 +0800
Subject: [PATCH] 1

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
index 692bf5d..45e60a1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
@@ -9,6 +9,7 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -46,9 +47,9 @@
     @TableField("purchase_limit")
     private Integer purchaseLimit;
 
-    @ApiModelProperty(value = "配送方式(1=自提,2=快递)")
+    @ApiModelProperty(value = "配送方式(1=自提,2=快递,1,2 = 自提+快递)")
     @TableField("distribution_mode")
-    private Integer distributionMode;
+    private String distributionMode;
 
     @ApiModelProperty(value = "指定门店(1=指定,2=所有)")
     @TableField("appoint_store")
@@ -98,9 +99,13 @@
     @TableField("integral")
     private Integer integral;
 
-    @ApiModelProperty(value = "商品权限JSON(0=全部,1=游客,2=普通会员,3=黄金会员,4=钻石会员,5=准代理,6=代理,7=总代,8=合伙人)")
+    @ApiModelProperty(value = "销量")
+    @TableField("sale_num")
+    private Integer saleNum;
+
+    @ApiModelProperty(value = "商品权限 逗号分隔(0=全部,1=游客,2=普通会员,3=黄金会员,4=钻石会员,5=准代理,6=代理,7=总代,8=合伙人)")
     @TableField("commodity_authority")
-    private Integer commodityAuthority;
+    private String commodityAuthority;
 
     @ApiModelProperty(value = "删除(0=否,1=是)")
     @TableField("del_flag")
@@ -115,5 +120,34 @@
     @TableField("status")
     private Integer status;
 
+    @TableField(exist = false)
+    private Integer vipId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "指定门店")
+    private List<GoodsShop> goodsShopList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "指定用户")
+    private List<GoodsAppUser> goodsAppUserList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "会员价格")
+    private List<GoodsVip> goodsVipList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "地区价格")
+    private List<GoodsArea> goodsAreaList;
+
+    @TableField(exist = false)
+    private String categoryName;
+
+    @TableField(exist = false)
+    private Integer showStatus;
+
+    public String getIdStr() {
+        return String.valueOf(id);
+    }
+
 
 }

--
Gitblit v1.7.1