From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 99 insertions(+), 4 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
index c3ed94b..5b3e9e1 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.web.dto.MultiFileDTO;
+import com.doumee.dao.web.response.goods.GoodsSkuResponse;
+import com.doumee.dao.web.response.goods.SkuResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -74,10 +77,9 @@
@ExcelColumn(name="鍝佺墝缂栫爜锛堝叧鑱攍abels琛級")
private Integer brandId;
- @ApiModelProperty(value = "灞曠ず浠锋牸", example = "1")
+ @ApiModelProperty(value = "灞曠ず浠锋牸(鍑哄巶浠�)", example = "1")
@ExcelColumn(name="灞曠ず浠锋牸")
private BigDecimal price;
-
@ApiModelProperty(value = "鍒濆閿�閲�", example = "1")
@ExcelColumn(name="鍒濆閿�閲�")
private Integer salenum;
@@ -113,18 +115,34 @@
@ApiModelProperty(value = "鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@ExcelColumn(name="鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
private String labels;
+ @ApiModelProperty(value = "鎵�灞炰笓鍖篒D闆嗗悎锛岋紙[1],[2]锛�")
+ @ExcelColumn(name="鎵�灞炰笓鍖篒D闆嗗悎锛岋紙[1],[2]锛�")
+ private String zhuanquIds;
+ @ApiModelProperty(value = "閫傜敤鍝佺墝ID闆嗗悎锛岋紙[1],[2]锛�")
+ @ExcelColumn(name="閫傜敤鍝佺墝ID闆嗗悎锛岋紙[1],[2]锛�")
+ private String brandIds;
+ @ApiModelProperty(value = "閫傜敤鍝佺墝绯诲垪ID闆嗗悎锛岋紙[1],[2]锛�")
+ @ExcelColumn(name="閫傜敤鍝佺墝绯诲垪ID闆嗗悎锛岋紙[1],[2]锛�")
+ private String serialIds;
@ApiModelProperty(value = "涓�绾у垎绫�")
@ExcelColumn(name="涓�绾у垎绫�")
private String parentCategoryId;
- @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1")
+ @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1", hidden = true)
private BigDecimal deductRata;
+
+ @ApiModelProperty(value = "sku閲嶉噺", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal weight;
@ApiModelProperty(value = "sku閲戦", hidden = true)
@TableField(exist = false)
private BigDecimal skuPrice;
+ @ApiModelProperty(value = "sku鏄剧ず浠锋牸", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal showPrice;
@ApiModelProperty(value = "sku鎬婚噾棰�", hidden = true)
@TableField(exist = false)
@@ -133,6 +151,10 @@
@ApiModelProperty(value = "skuId", hidden = true)
@TableField(exist = false)
private Integer skuId;
+
+ @ApiModelProperty(value = "sku鍥剧墖", hidden = true)
+ @TableField(exist = false)
+ private String skuImg;
@ApiModelProperty(value = "鍟嗗搧杞挱鍥�", example = "1")
@TableField(exist = false)
@@ -166,15 +188,88 @@
@ApiModelProperty(value = "tab鍒囨崲鐘舵��;1鍏ㄩ儴锛�2锛屽凡鍞絼锛�3鍥炴敹")
@TableField(exist = false)
private Integer tabStatus;
-
+ @ApiModelProperty(value = "鍗曚綅")
+ @TableField(exist = false)
+ private String unitName;
@ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
@TableField(exist = false)
private List<Sku> skuList;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜闆嗗悎")
+ @TableField(exist = false)
+ private List<Integer> idList;
+ @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
+ @TableField(exist = false)
+ private List<Labels> brandList;
@ApiModelProperty(value = "鍟嗗搧SKU瑙勬牸缁�")
@TableField(exist = false)
private List<GoodsSku> goodsSkuList;
+ @ApiModelProperty(value = "渚涢姺鍟嗘暟閲�")
+ @TableField(exist = false)
+ private Long shopNum;
+ @ApiModelProperty(value = "宸茶缃緵閵峰晢鏁伴噺")
+ @TableField(exist = false)
+ private Long pricedShopNum;
+
+ @ApiModelProperty(value = "shopId" )
+ @TableField(exist = false)
+ private Integer shopId;
+ @ApiModelProperty(value = "涓撳尯缂栫爜" )
+ @TableField(exist = false)
+ private Integer zhuanquId;
+
+ @ApiModelProperty(value = "鍟嗗渚涜揣浠�" )
+ @TableField(exist = false)
+ private BigDecimal shopPrice;
+
+ @ApiModelProperty(value = "閿�閲�" )
+ @TableField(exist = false)
+ private Integer realSaleNum;
+
+ @ApiModelProperty(value = "鏈�浣庝环" )
+ @TableField(exist = false)
+ private BigDecimal minPrice;
+
+ @ApiModelProperty(value = "鍒掔嚎浠�" )
+ @TableField(exist = false)
+ private BigDecimal linePrice;
+
+ @ApiModelProperty(value = "渚涜揣浠�")
+ @TableField(exist = false)
+ private BigDecimal exFactoryPrice;
+
+ @ApiModelProperty(value = "閫傜敤鍝佺墝鍚嶇О")
+ @TableField(exist = false)
+ private String brandNames ;
+
+ @ApiModelProperty(value = "鐪熷疄搴撳瓨")
+ @TableField(exist = false)
+ private Integer stock;
+
+ @ApiModelProperty(value = "鏀惰棌鐘舵�侊細0=鏈敹钘忥紱1=宸叉敹钘�")
+ @TableField(exist = false)
+ private Integer collectStatus;
+
+ @ApiModelProperty(value = "鍟嗗搧瑙勬牸鍒楄〃")
+ @TableField(exist = false)
+ private List<GoodsSkuResponse> goodsSkuResponseList;
+ @ApiModelProperty(value = "鍟嗗搧鍟嗗搧SKU淇℃伅鍒楄〃")
+ @TableField(exist = false)
+ private List<SkuResponse> skuResponsesList;
+
+ @ApiModelProperty(value = "鍟嗗搧鍒嗙被")
+ @TableField(exist = false)
+ private Labels categoryLabels;
+
+
+ @ApiModelProperty(value = "鍝佺墝")
+ @TableField(exist = false)
+ private Labels brandLabels;
+
+ @ApiModelProperty(value = "鍟嗗搧杞挱鍥�")
+ @TableField(exist = false)
+ private List<MultiFileDTO> goodBannerMultiFiles;
}
--
Gitblit v1.9.3