diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java index a435ae1..e2f7b2a 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java @@ -1,9 +1,11 @@ package com.baiye.modules.distribute.dto; +import com.baiye.validation.group.CreateGroup; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springdoc.api.annotations.ParameterObject; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; /** @@ -34,4 +36,8 @@ public class StoreDTO { private String county; @Schema(description = "详情") private String detail; + @Schema(description = "营业开始时间") + private String tradeStartTime; + @Schema(description = "营业结束时间") + private String tradeEndTime; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java index acc3759..f6b1460 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java @@ -46,12 +46,15 @@ public class StoreEntity extends LogicDeletedBaseEntity { @Schema(description = "nid") private String nid; @Schema(description = "省份") + @NotNull(message = "省份不能为空", groups = {CreateGroup.class}) private String province; @Schema(description = "城市") + @NotNull(message = "城市不能为空", groups = {CreateGroup.class}) private String city; @Schema(description = "区县") + @NotNull(message = "区县不能为空", groups = {CreateGroup.class}) private String county; @Schema(description = "详细地址") diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java index e5f6125..37814ec 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.baiye.domain.PageParam; @@ -99,6 +100,12 @@ public class StoreServiceImpl extends ExtendServiceImpl