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/store/view/StoreSimpleView.java | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreSimpleView.java b/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreSimpleView.java
index 1a93719..6652206 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreSimpleView.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreSimpleView.java
@@ -1,16 +1,84 @@
package com.oying.modules.pc.store.view;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalTime;
@Data
public class StoreSimpleView {
- private Long id;
+ @ApiModelProperty(value = "店铺ID")
+ private Long storeId;
- private String name;
+ @ApiModelProperty(value = "商户ID")
+ private Long merchantId;
- private String logoUrl;
+ @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图片")
+ private Long logoImageId;
+
+ @ApiModelProperty(value = "店铺logo图片Url")
+ private String logoImageUrl;
+
+ @ApiModelProperty(value = "店铺封面图")
+ private Long coverImageId;
+
+ @ApiModelProperty(value = "店铺封面图Url")
+ private String coverImageUrl;
+
+ @ApiModelProperty(value = "店铺描述")
+ private String description;
+
+ @ApiModelProperty(value = "配送费用")
+ private BigDecimal deliveryFee;
+
+ @ApiModelProperty(value = "起送金额")
+ private BigDecimal deliveryMinimum;
+
+ @ApiModelProperty(value = "联系电话")
+ private String contactPhone;
+
+ @ApiModelProperty(value = "营业开始时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
+ private LocalTime openTime;
+
+ @ApiModelProperty(value = "营业结束时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
+ private LocalTime closeTime;
+
+ @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;
+
}
--
Gitblit v1.9.3