From fc0128242f812e476470dc9bada901d36ae09daf Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Thu, 31 Jul 2025 16:37:52 +0800
Subject: [PATCH] feat: 1、增加店铺包装费用 2、修复营业时间显示问题和修改异常问题
---
oying-system/src/main/java/com/oying/modules/pc/store/view/CustomerStoreView.java | 101 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 11 deletions(-)
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 b68087a..d3f2474 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
@@ -1,28 +1,107 @@
package com.oying.modules.pc.store.view;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.oying.modules.pc.store.domain.StoreQualification;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.List;
@Data
public class CustomerStoreView {
- private String name;
+ @ApiModelProperty(value = "店铺ID")
+ private Long storeId;
- private String logoUrl;
+ @ApiModelProperty(value = "商户ID")
+ private Long merchantId;
+ @ApiModelProperty(value = "平台类目")
+ private Long platformCategoryId;
+
+ @ApiModelProperty(value = "店铺类型：1-自营 2-加盟 3-第三方")
+ private Integer storeType;
+
+ @ApiModelProperty(value = "店铺名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "店铺logo图片Url")
+ private String logoImageUrl;
+
+ @ApiModelProperty(value = "店铺封面图Url")
+ private String coverImageUrl;
+
+ @ApiModelProperty(value = "店铺描述")
private String description;
- private String address;
-
- private String businessHours;
-
+ @ApiModelProperty(value = "联系电话")
private String contactPhone;
- private Integer score;
+ @ApiModelProperty(value = "营业时间")
+ private String businessHours;
- private Integer deliveryDuration;
+ @ApiModelProperty(value = "营业开始时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
+ private LocalTime openTime;
- private Integer monthlySales;
+ @ApiModelProperty(value = "营业结束时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
+ private LocalTime closeTime;
+
+ @ApiModelProperty(value = "营业状态")
+ private Integer businessStatus;
+
+ @ApiModelProperty(value = "市级代码")
+ private String cityCode;
+
+ @ApiModelProperty(value = "详细地址")
+ private String address;
+
+ @ApiModelProperty(value = "经度")
+ private Double longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private Double latitude;
+
+ @ApiModelProperty(value = "营业半径(米)")
+ private Integer radius;
+
+ @ApiModelProperty(value = "是否支持退货")
+ private Integer returns;
+
+ @ApiModelProperty(value = "是否支持自提")
+ private Integer selfPickup;
+
+ @ApiModelProperty(value = "评分")
+ private Double score = 0d;
+
+ @ApiModelProperty(value = "包装费用")
+ private BigDecimal packagingFee;
+
+ @ApiModelProperty(value = "配送费用")
+ private BigDecimal deliveryFee;
+
+ @ApiModelProperty(value = "起送金额")
+ private BigDecimal deliveryMinimum;
+
+ @ApiModelProperty(value = "配送距离")
+ private Integer deliveryDuration = 0;
+
+ @ApiModelProperty(value = "配送时长")
+ private Integer deliveryTime = 0;
+
+ @ApiModelProperty(value = "销量")
+ private Integer totalUnitsSold = 0;
+
+ @ApiModelProperty(value = "月销售量")
+ private Integer monthlyUnitsSold = 0;
+
+ @ApiModelProperty(value = "资质")
+ private List<StoreQualification> qualifications;
}
--
Gitblit v1.9.3