From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 58 ++++++++++++++++++++++------------------------------------
1 files changed, 22 insertions(+), 36 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 8b09cac..8f56c78 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
@@ -40,21 +40,11 @@
@TableField("goods_category_id")
private Integer goodsCategoryId;
- @ApiModelProperty(value = "类型（1=服务商品，2=单品商品）")
- @TableField("type")
- private Integer type;
@ApiModelProperty(value = "限购数量（-1不限购）")
@TableField("purchase_limit")
private Integer purchaseLimit;
- @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
- @TableField("distribution_mode")
- private String distributionMode;
-
- @ApiModelProperty(value = "指定门店（1=指定，2=所有）")
- @TableField("appoint_store")
- private Integer appointStore;
@ApiModelProperty(value = "商品简介")
@TableField("introduction")
@@ -72,25 +62,10 @@
@TableField("detail")
private String detail;
- @ApiModelProperty(value = "运营成本")
- @TableField("operating_cost")
- private BigDecimal operatingCost;
-
- @ApiModelProperty(value = "门店成本")
- @TableField("shop_cost")
- private BigDecimal shopCost;
-
@ApiModelProperty(value = "划线价")
@TableField("original_price")
private BigDecimal originalPrice;
- @ApiModelProperty(value = "现金支付（0=否，1=是）")
- @TableField("cash_payment")
- private Integer cashPayment;
-
- @ApiModelProperty(value = "积分支付（0=否，1=是）")
- @TableField("point_payment")
- private Integer pointPayment;
@ApiModelProperty(value = "基础售价")
@TableField("selling_price")
@@ -104,10 +79,6 @@
@TableField("sale_num")
private Integer saleNum;
- @ApiModelProperty(value = "商品权限 逗号分隔（-1=全部，0=游客，1=普通会员，2=黄金会员，3=钻石会员，4=准代理，5=代理，6=总代，7=合伙人）")
- @TableField("commodity_authority")
- private String commodityAuthority;
-
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
private Integer delFlag;
@@ -120,25 +91,40 @@
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "活动状态（1-未开始，2-进行中，3-已结束）")
+
+ @TableField(exist = false)
+ private Integer activityStatus;
+
+
@ApiModelProperty(value = "排序")
@TableField("sort")
private Integer sort;
+ /**
+ * 后台商品列表查询所需字段
+ */
+ @ApiModelProperty(value = "用于店铺名称模糊查询")
@TableField(exist = false)
- private Integer vipId;
-
+ private String shopName;
+ @ApiModelProperty(value = "用于按店铺ID精确查询")
@TableField(exist = false)
- @ApiModelProperty(value = "指定门店")
- private List<GoodsShop> goodsShopList;
-
+ private Integer shopId;
+ @ApiModelProperty(value = "分类名称")
@TableField(exist = false)
private String categoryName;
@TableField(exist = false)
- private Integer showStatus;
+ @ApiModelProperty(value = "指定门店")
+ private GoodsShop goodsShop;
+
+ @ApiModelProperty(value = "经度")
@TableField(exist = false)
- private String payMethod;
+ private BigDecimal longitude;
+ @ApiModelProperty(value = "纬度")
+ @TableField(exist = false)
+ private BigDecimal latitude;
/**
* 排序字段
--
Gitblit v1.7.1