From 02fb5e406abcda2534ed1f2505c5226027c13473 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Mon, 23 Jun 2025 00:57:32 +0800
Subject: [PATCH] fix:调整字段

---
 oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java                      |   10 +++++++++-
 oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java                  |    8 ++++++++
 oying-system/src/main/java/com/oying/modules/pc/store/view/CustomerStoreView.java            |    8 +++++++-
 oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCustomerDetailDto.java |   12 +++++++-----
 oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java        |    9 ++++-----
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java
index 2fe6124..566ea69 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java
@@ -102,6 +102,14 @@
     @ApiModelProperty(value = "是否支持自提")
     private Integer selfPickup;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "销量")
+    private Integer totalUnitsSold = 0;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "月销售量")
+    private Integer monthlyUnitsSold = 0;
+
     @NotNull
     @ApiModelProperty(value = "是否删除")
     private Integer deletedFlag;
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 da2fed3..75aebc4 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;
@@ -75,8 +71,11 @@
     @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<>();
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java
index 461c7cb..8eb184c 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java
@@ -141,8 +141,16 @@
     private Integer deliveryDuration = 0;
 
     @TableField(exist = false)
+    @ApiModelProperty(value = "配送时长")
+    private Integer deliveryTime = 0;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "销量")
+    private Integer totalUnitsSold = 0;
+
+    @TableField(exist = false)
     @ApiModelProperty(value = "月销售量")
-    private Integer monthlySales = 0;
+    private Integer monthlyUnitsSold = 0;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "资质")
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCustomerDetailDto.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCustomerDetailDto.java
index 71a83b9..7dc881f 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCustomerDetailDto.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCustomerDetailDto.java
@@ -1,6 +1,5 @@
 package com.oying.modules.pc.store.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -65,16 +64,19 @@
     @ApiModelProperty(value = "是否支持自提")
     private Integer selfPickup;
 
-    @TableField(exist = false)
     @ApiModelProperty(value = "评分")
     private Double score = 0d;
 
-    @TableField(exist = false)
     @ApiModelProperty(value = "配送距离")
     private Integer deliveryDuration = 0;
 
-    @TableField(exist = false)
+    @ApiModelProperty(value = "配送时长")
+    private Integer deliveryTime = 0;
+
+    @ApiModelProperty(value = "销量")
+    private Integer totalUnitsSold = 0;
+
     @ApiModelProperty(value = "月销售量")
-    private Integer monthlySales = 0;
+    private Integer monthlyUnitsSold = 0;
 
 }
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/view/CustomerStoreView.java b/oying-system/src/main/java/com/oying/modules/pc/store/view/CustomerStoreView.java
index 8614da5..b43552e 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/view/CustomerStoreView.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/view/CustomerStoreView.java
@@ -73,7 +73,13 @@
     @ApiModelProperty(value = "配送距离")
     private Integer deliveryDuration = 0;
 
+    @ApiModelProperty(value = "配送时长")
+    private Integer deliveryTime = 0;
+
+    @ApiModelProperty(value = "销量")
+    private Integer totalUnitsSold = 0;
+
     @ApiModelProperty(value = "月销售量")
-    private Integer monthlySales = 0;
+    private Integer monthlyUnitsSold = 0;
 
 }

--
Gitblit v1.9.3