From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java b/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java
index 521debc..08347c8 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java
@@ -1,12 +1,8 @@
package com.oying.modules.pc.product.view;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.collection.ListUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +23,20 @@
@ApiModelProperty(value = "店铺ID")
private Long storeId;
+ @ApiModelProperty(value = "条形码")
+ private String barcode;
+
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+
@ApiModelProperty(value = "商品标题")
private String title;
+
+ @ApiModelProperty(value = "一级分类ID")
+ private Long categoryId;
+
+ @ApiModelProperty(value = "二级分类ID")
+ private Long secondCategoryId;
@ApiModelProperty(value = "状态")
private Integer status;
@@ -42,8 +50,38 @@
@ApiModelProperty(value = "销售价格")
private BigDecimal price;
+ @ApiModelProperty(value = "库存数量")
+ private Integer stockQuantity;
+
+ @ApiModelProperty(value = "起售数量")
+ private Integer minPurchaseQuantity;
+
+ @ApiModelProperty(value = "重量（单位：g）")
+ private Integer weight;
+
+ @ApiModelProperty(value = "宽度（单位：厘米）")
+ private Integer width;
+
+ @ApiModelProperty(value = "长度（单位：厘米）")
+ private Integer length;
+
+ @ApiModelProperty(value = "高度（单位：厘米）")
+ private Integer height;
+
+ @ApiModelProperty(value = "是否支持退货")
+ private Integer returns;
+
+ @ApiModelProperty(value = "是否支持自提")
+ private Integer selfPickup;
+
+ @ApiModelProperty(value = "版本号")
+ private Long version;
+
+ @ApiModelProperty(value = "销量")
+ private Integer totalUnitsSold = 0;
+
@ApiModelProperty(value = "月销售量")
- private Integer monthlySales = 0;
+ private Integer monthlyUnitsSold = 0;
private List<ProductImageCustomerView> images = new ArrayList<>();
private List<ProductLabelCustomerView> labels = new ArrayList<>();
--
Gitblit v1.9.3