From 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 07 Aug 2025 15:57:07 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreFieldUpdateRequest.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 848330e..b53dfbd 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,6 @@
package com.oying.modules.pc.store.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -34,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{}
@@ -54,6 +61,11 @@
@NotNull(groups = UpdateStoreDeliveryFeeGroup.class)
private BigDecimal deliveryFee;
+ public interface UpdateStorePackagingFeeGroup{}
+
+ @NotNull(groups = UpdateStorePackagingFeeGroup.class)
+ private BigDecimal packagingFee;
+
public interface UpdateStoreDeliveryMinimumGroup{}
@NotNull(groups = UpdateStoreDeliveryMinimumGroup.class)
@@ -67,9 +79,11 @@
public interface UpdateStoreBusinessHoursGroup{}
@NotNull(groups = UpdateStoreBusinessHoursGroup.class)
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
private LocalTime openTime;
@NotNull(groups = UpdateStoreBusinessHoursGroup.class)
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
private LocalTime closeTime;
public interface UpdateStoreAddressGroup{}
--
Gitblit v1.9.3