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/domain/dto/StoreCustomerDetailDto.java |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 66 insertions(+), 7 deletions(-)

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 765a099..c693101 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,26 +1,85 @@
 package com.oying.modules.pc.store.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.time.LocalTime;
 
 @Data
 public class StoreCustomerDetailDto {
 
-    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;
+    @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;
 
     private String businessHours;
 
-    private String contactPhone;
+    @ApiModelProperty(value = "详细地址")
+    private String address;
 
-    private Integer score;
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
 
-    private Integer deliveryDuration;
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
 
-    private Integer monthlySales;
+    @ApiModelProperty(value = "营业半径(米)")
+    private Integer radius;
+
+    @ApiModelProperty(value = "是否支持退货")
+    private Integer returns;
+
+    @ApiModelProperty(value = "是否支持自提")
+    private Integer selfPickup;
+
+    @ApiModelProperty(value = "评分")
+    private Double score = 0d;
+
+    @ApiModelProperty(value = "配送距离")
+    private Integer deliveryDuration = 0;
+
+    @ApiModelProperty(value = "配送时长")
+    private Integer deliveryTime = 0;
+
+    @ApiModelProperty(value = "销量")
+    private Integer totalUnitsSold = 0;
+
+    @ApiModelProperty(value = "月销售量")
+    private Integer monthlyUnitsSold = 0;
 
 }

--
Gitblit v1.9.3