From 235b4e66641158aab1d54ca699c6e0c637867a6c Mon Sep 17 00:00:00 2001
From: jeonghyemin <hyem5019@gmail.com>
Date: Fri, 25 Jul 2025 14:37:49 +0900
Subject: [PATCH] =?UTF-8?q?feat(Order):=20=EC=98=A4=ED=94=88=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84,=20=EA=B3=B5=EC=A7=80=20=EC=B9=BC=EB=9F=BC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/dto/StoreCreateRequest.java             |  2 ++
 .../store/dto/StoreCreateResponse.java            |  4 ++++
 .../applicationadmin/store/dto/StoreReadDto.java  |  4 ++++
 .../store/dto/StoreUpdateRequest.java             |  2 ++
 .../store/service/StoreServiceImpl.java           |  4 +++-
 .../nowait/domaincorerdb/store/entity/Store.java  | 15 +++++++++++++--
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java
index 4fa8c3e9..4bd9ff23 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateRequest.java
@@ -29,6 +29,8 @@ public Store toEntity() {
 			.name(name)
 			.location(location)
 			.description(description)
+			.notice("")
+			.openTime("00002359")
 			.isActive(false)
 			.deleted(false)
 			.build();
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java
index cc76f894..bfcac36d 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreCreateResponse.java
@@ -18,6 +18,8 @@ public class StoreCreateResponse {
 	private String name;
 	private String location;
 	private String description;
+	private String notice;
+	private String openTime;
 	private Boolean isActive;
 	private Boolean deleted;
 	private LocalDateTime createdAt;
@@ -30,6 +32,8 @@ public static StoreCreateResponse fromEntity(Store store) {
 			.name(store.getName())
 			.location(store.getLocation())
 			.description(store.getDescription())
+			.notice(store.getNotice())
+			.openTime(store.getOpenTime())
 			.isActive(store.getIsActive())
 			.deleted(store.getDeleted())
 			.build();
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java
index 68dee6be..5620cd02 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreReadDto.java
@@ -19,6 +19,8 @@ public class StoreReadDto {
 	private String name;
 	private String location;
 	private String description;
+	private String notice;
+	private String openTime;
 	private StoreImageUploadResponse profileImage;
 	private List<StoreImageUploadResponse> bannerImages;
 	private Boolean isActive;
@@ -43,6 +45,8 @@ public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse
 			.name(store.getName())
 			.location(store.getLocation())
 			.description(store.getDescription())
+			.notice(store.getNotice())
+			.openTime(store.getOpenTime())
 			.isActive(store.getIsActive())
 			.deleted(store.getDeleted())
 			.profileImage(profile)
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java
index c6b2ccbb..1cd2419e 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/dto/StoreUpdateRequest.java
@@ -13,4 +13,6 @@ public class StoreUpdateRequest {
 	private String name;
 	private String location;
 	private String description;
+	private String notice;
+	private String openTime;
 }
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java
index 7944746c..e2c48806 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java
@@ -82,7 +82,9 @@ public StoreReadDto updateStore(Long storeId, StoreUpdateRequest request, Member
 		store.updateInfo(
 			request.getName(),
 			request.getLocation(),
-			request.getDescription()
+			request.getDescription(),
+			request.getNotice(),
+			request.getOpenTime()
 		);
 
 		Store updatedStore = storeRepository.save(store);
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/store/entity/Store.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/store/entity/Store.java
index 08175e48..446e40b0 100644
--- a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/store/entity/Store.java
+++ b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/store/entity/Store.java
@@ -40,6 +40,12 @@ public class Store extends BaseTimeEntity {
 	@Column(nullable = true, length = 200)
 	private String description;
 
+	@Column(nullable = true, length = 200)
+	private String notice;
+
+	@Column(nullable = true, length = 200)
+	private String openTime;
+
 	@Column(name = "is_active", nullable = false)
 	private Boolean isActive;
 
@@ -47,21 +53,25 @@ public class Store extends BaseTimeEntity {
 	private Boolean deleted;
 
 	public Store(LocalDateTime createdAt, Long storeId, Long departmentId, String name, String location,
-		String description, Boolean isActive, Boolean deleted) {
+		String description,String notice,String openTime, Boolean isActive, Boolean deleted) {
 		super(createdAt);
 		this.storeId = storeId;
 		this.departmentId = departmentId;
 		this.name = name;
 		this.location = location;
 		this.description = description;
+		this.notice = notice;
+		this.openTime = openTime;
 		this.isActive = isActive;
 		this.deleted = deleted;
 	}
 
-	public void updateInfo(String name, String location, String description) {
+	public void updateInfo(String name, String location, String description, String notice, String openTime) {
 		if (name != null) this.name = name;
 		if (location != null) this.location = location;
 		if (description != null) this.description = description;
+		if (notice != null) this.notice = notice;
+		if (openTime != null) this.openTime = openTime;
 	}
 
 	public void markAsDeleted() {
@@ -71,4 +81,5 @@ public void markAsDeleted() {
 	public void toggleActive() {
 		this.isActive = !this.isActive;
 	}
+
 }