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/StoreFieldUpdateRequest.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreFieldUpdateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreFieldUpdateRequest.java
index a273357..faba857 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreFieldUpdateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreFieldUpdateRequest.java
@@ -1,5 +1,7 @@
package com.oying.modules.pc.store.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -33,10 +35,16 @@
@NotNull(groups = UpdateStoreBusinessStatusGroup.class)
private Integer businessStatus;
+ @ApiModelProperty(value = "店铺logo图片")
+ private Long logoImageId;
+
public interface UpdateStoreLogoImageGroup{}
@NotBlank(groups = UpdateStoreLogoImageGroup.class)
private String logoImageUploadId;
+
+ @ApiModelProperty(value = "店铺封面图")
+ private Long coverImageId;
public interface UpdateStoreCoverImageGroup{}
@@ -50,12 +58,12 @@
public interface UpdateStoreDeliveryFeeGroup{}
- @NotBlank(groups = UpdateStoreDeliveryFeeGroup.class)
+ @NotNull(groups = UpdateStoreDeliveryFeeGroup.class)
private BigDecimal deliveryFee;
public interface UpdateStoreDeliveryMinimumGroup{}
- @NotBlank(groups = UpdateStoreDeliveryMinimumGroup.class)
+ @NotNull(groups = UpdateStoreDeliveryMinimumGroup.class)
private BigDecimal deliveryMinimum;
public interface UpdateStoreContactPhoneGroup{}
@@ -65,10 +73,12 @@
public interface UpdateStoreBusinessHoursGroup{}
- @NotBlank(groups = UpdateStoreBusinessHoursGroup.class)
+ @NotNull(groups = UpdateStoreBusinessHoursGroup.class)
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
private LocalTime openTime;
- @NotBlank(groups = UpdateStoreBusinessHoursGroup.class)
+ @NotNull(groups = UpdateStoreBusinessHoursGroup.class)
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
private LocalTime closeTime;
public interface UpdateStoreAddressGroup{}
@@ -78,15 +88,24 @@
public interface UpdateStoreLocationGroup{}
- @NotBlank(groups = UpdateStoreLocationGroup.class)
+ @NotNull(groups = UpdateStoreLocationGroup.class)
private Double longitude;
- @NotBlank(groups = UpdateStoreLocationGroup.class)
+ @NotNull(groups = UpdateStoreLocationGroup.class)
private Double latitude;
public interface UpdateStoreRadiusGroup{}
- @NotBlank(groups = UpdateStoreRadiusGroup.class)
+ @NotNull(groups = UpdateStoreRadiusGroup.class)
private Integer radius;
+ @ApiModelProperty(value = "是否支持退货")
+ private Integer returns;
+
+ @ApiModelProperty(value = "是否支持自提")
+ private Integer selfPickup;
+
+ @ApiModelProperty(value = "版本号")
+ private Long version;
+
}
--
Gitblit v1.9.3