From af44c4217ce9483ef2de2beef0f0dd52a0c6beac Mon Sep 17 00:00:00 2001
From: wjt <wujingtao_t@126.com>
Date: Fri, 22 Sep 2023 11:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=90=A5=E4=B8=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/baiye/modules/distribute/dto/StoreDTO.java    |  6 ++++++
 .../baiye/modules/distribute/entity/StoreEntity.java  |  3 +++
 .../distribute/service/impl/StoreServiceImpl.java     | 11 +++++++++++
 admin/src/main/resources/mapper/StoreMapper.xml       |  2 ++
 4 files changed, 22 insertions(+)

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<StoreMapper, StoreEntity
 		return Convert.toList(StoreVO.class, storeEntities);
 	}
 
+	public static void main(String[] args) {
+		String tradeStartTime = "01:02:03";
+		String s = StrUtil.subBefore(tradeStartTime, ":", true);
+		System.out.println(s);
+	}
+
 	@Override
 	public void addStore(StoreEntity storeEntity) {
 		//同一个公司门店名不能重复
@@ -107,6 +114,10 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 		if (storeEntity1 != null) {
 			throw new BadRequestException("门店名称重复");
 		}
+		String tradeStartTime = StrUtil.subBefore(storeEntity.getTradeStartTime(), ":", true);
+		String tradeEndTime = StrUtil.subBefore(storeEntity.getTradeEndTime(), ":", true);
+		storeEntity.setTradeStartTime(tradeStartTime);
+		storeEntity.setTradeEndTime(tradeEndTime);
 		baseMapper.insert(storeEntity);
 		if (storeEntity.getUserId() != null) {
 			storeUserService.insertStoreUser(storeEntity.getId(), storeEntity.getUserId());
diff --git a/admin/src/main/resources/mapper/StoreMapper.xml b/admin/src/main/resources/mapper/StoreMapper.xml
index b468a43..070f8e9 100644
--- a/admin/src/main/resources/mapper/StoreMapper.xml
+++ b/admin/src/main/resources/mapper/StoreMapper.xml
@@ -39,6 +39,8 @@
 			   nid,
 			   county,
 			   detail,
+			   trade_start_time                                                                 as tradeStartTime,
+			   trade_end_time                                                                   as tradeEndTime,
 			   ROUND(6378.137 * 2 * ASIN(SQRT(POW(SIN((
 																	  #{lat}
 																	  * PI() / 180 -