Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-14 b4d3224898d50b8f1e30b5c8083a520743927282

 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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
@@ -33,10 +34,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 +57,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 +72,10 @@

    public interface UpdateStoreBusinessHoursGroup{}

    @NotBlank(groups = UpdateStoreBusinessHoursGroup.class)
    @NotNull(groups = UpdateStoreBusinessHoursGroup.class)
    private LocalTime openTime;

    @NotBlank(groups = UpdateStoreBusinessHoursGroup.class)
    @NotNull(groups = UpdateStoreBusinessHoursGroup.class)
    private LocalTime closeTime;

    public interface UpdateStoreAddressGroup{}
@@ -78,15 +85,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;

}