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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 71a83b9..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,6 +1,6 @@
package com.oying.modules.pc.store.domain.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,9 +40,11 @@
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;
@@ -65,16 +67,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;
}
--
Gitblit v1.9.3