From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 17 Oct 2025 17:20:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductRevisionRecord.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductRevisionRecord.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductRevisionRecord.java
index ae1e04a..3f91b2a 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductRevisionRecord.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductRevisionRecord.java
@@ -1,32 +1,59 @@
package com.oying.modules.pc.product.domain.dto;
-import com.oying.modules.pc.store.domain.StoreQualification;
-import com.oying.modules.pc.store.domain.dto.StoreQualificationUpdateRequest;
+import com.oying.modules.pc.product.domain.ProductLabel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Data
public class ProductRevisionRecord {
- @ApiModelProperty(value = "店铺ID")
- private Long storeId;
+ private Long productId;
- @ApiModelProperty(value = "店铺名称")
- private String storeName;
+ private String barcode;
- @ApiModelProperty(value = "资质")
- private List<StoreQualification> qualifications = new ArrayList<>();
-
- @ApiModelProperty(value = "删除的资质")
- private List<Long> deletedQualificationIds = new ArrayList<>();
+ private String name;
- @ApiModelProperty(value = "修改的资质")
- private List<StoreQualificationUpdateRequest> updatedQualifications = new ArrayList<>();
+ private String title;
- @ApiModelProperty(value = "新增的资质")
- private List<StoreQualification> newQualifications = new ArrayList<>();
-
+ private Long categoryId;
+
+ private Long secondCategoryId;
+
+ private BigDecimal price;
+
+ private Integer stockQuantity;
+
+ private Integer minPurchaseQuantity;
+
+ private Integer warnStock;
+
+ private Integer weight;
+
+ private Integer length;
+
+ private Integer width;
+
+ private Integer height;
+
+ @ApiModelProperty(value = "是否支持退货")
+ private Integer returns;
+
+ @ApiModelProperty(value = "是否支持自提")
+ private Integer selfPickup;
+
+ private List<Long> deletedImageIds = new ArrayList<>();
+
+ private List<ProductImageUpdateRequest> updatedImages = new ArrayList<>();
+
+ private List<ProductImageCreateRequest> newImages = new ArrayList<>();
+
+ private List<Long> deletedLabelIds = new ArrayList<>();
+
+ private List<ProductLabel> updatedLabels = new ArrayList<>();
+
+ private List<ProductLabel> newLabels = new ArrayList<>();
}
--
Gitblit v1.9.3