From 17abf0608f62cdd318dba3e7b12a32ea486cb482 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期一, 21 四月 2025 20:34:03 +0800 Subject: [PATCH] 导入导出,财务统计 --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 39 +++++++++++---------------------------- 1 files changed, 11 insertions(+), 28 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 23c2d46..c6bdd6c 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 @@ -62,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") @@ -93,10 +78,6 @@ @ApiModelProperty(value = "销量") @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") @@ -114,21 +95,23 @@ @TableField("sort") private Integer sort; + /** + * 后台商品列表查询所需字段 + */ + @ApiModelProperty(value = "用于店铺名称模糊查询") @TableField(exist = false) - private Integer vipId; + private String shopName; + @ApiModelProperty(value = "用于按店铺ID精确查询") + @TableField(exist = false) + private Integer shopId; + @ApiModelProperty(value = "分类名称") + @TableField(exist = false) + private String categoryName; @TableField(exist = false) @ApiModelProperty(value = "指定门店") private GoodsShop goodsShop; - @TableField(exist = false) - private String categoryName; - - @TableField(exist = false) - private Integer showStatus; - - @TableField(exist = false) - private String payMethod; @ApiModelProperty(value = "经度") @TableField(exist = false) -- Gitblit v1.7.1