Merge pull request #106 from GTable/feature/#103-Store-SalesSum

Jjiggu · web-flow · commit e624bfbe9d18 · 2025-07-15T20:26:26.000+09:00
Feat : Admin 통계 기능 추가
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java
@@ -17,6 +17,8 @@
 import com.nowait.applicationadmin.order.dto.OrderStatusUpdateResponseDto;
 import com.nowait.applicationadmin.order.service.OrderService;
 import com.nowait.common.api.ApiUtils;
+import com.nowait.domaincorerdb.order.dto.OrderSalesSumDetail;
+import com.nowait.domaincorerdb.order.dto.TopSalesStoresDetail;
 import com.nowait.domaincorerdb.user.entity.MemberDetails;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -31,36 +33,66 @@
 @RequiredArgsConstructor
 public class OrderController {
 
-    private final OrderService orderService;
+	private final OrderService orderService;
 
-    @GetMapping("/{storeId}")
-    @Operation(summary = "주점별 주문리스트 조회", description = "특정 주점에 대한 예약리스트 조회")
-    @ApiResponse(responseCode = "200", description = "주리스트 조회")
-    public ResponseEntity<?> getOrderListByStoreId(@PathVariable Long storeId,
-        @AuthenticationPrincipal MemberDetails memberDetails) {
-        List<OrderResponseDto> response = orderService.findAllOrders(storeId,memberDetails);
-        return ResponseEntity
-            .status(HttpStatus.OK)
-            .body(
-                ApiUtils.success(
-                    response
-                )
-            );
-    }
+	@GetMapping("/{storeId}")
+	@Operation(summary = "주점별 주문리스트 조회", description = "특정 주점에 대한 예약리스트 조회")
+	@ApiResponse(responseCode = "200", description = "주리스트 조회")
+	public ResponseEntity<?> getOrderListByStoreId(@PathVariable Long storeId,
+		@AuthenticationPrincipal MemberDetails memberDetails) {
+		List<OrderResponseDto> response = orderService.findAllOrders(storeId, memberDetails);
+		return ResponseEntity
+			.status(HttpStatus.OK)
+			.body(
+				ApiUtils.success(
+					response
+				)
+			);
+	}
 
-    @PatchMapping("/status/{orderId}")
-    @Operation(summary = "주문 상태 변경", description = "특정 주문의 상태를 변경.")
-    @ApiResponse(responseCode = "200", description = "주문 상태 변경 성공")
-    @ApiResponse(responseCode = "400", description = "주문을 찾을 수 없음")
-    public ResponseEntity<?> updateOrderStatus(
-        @PathVariable Long orderId,
-        @RequestBody@Valid OrderStatusUpdateRequestDto requestDto,
-        @AuthenticationPrincipal MemberDetails memberDetails
-    ) {
-        OrderStatusUpdateResponseDto response = orderService.updateOrderStatus(
-            orderId,requestDto.getOrderStatus(),memberDetails);
-        return ResponseEntity
-            .status(HttpStatus.OK)
-            .body(ApiUtils.success(response));
-    }
+	@PatchMapping("/status/{orderId}")
+	@Operation(summary = "주문 상태 변경", description = "특정 주문의 상태를 변경.")
+	@ApiResponse(responseCode = "200", description = "주문 상태 변경 성공")
+	@ApiResponse(responseCode = "400", description = "주문을 찾을 수 없음")
+	public ResponseEntity<?> updateOrderStatus(
+		@PathVariable Long orderId,
+		@RequestBody @Valid OrderStatusUpdateRequestDto requestDto,
+		@AuthenticationPrincipal MemberDetails memberDetails
+	) {
+		OrderStatusUpdateResponseDto response = orderService.updateOrderStatus(
+			orderId, requestDto.getOrderStatus(), memberDetails);
+		return ResponseEntity
+			.status(HttpStatus.OK)
+			.body(ApiUtils.success(response));
+	}
+
+	@GetMapping("/sales")
+	@Operation(summary = "오늘의 매출 조회", description = "오늘의 매출을 조회합니다.")
+	@ApiResponse(responseCode = "200", description = "오늘의 매출 조회 성공")
+	public ResponseEntity<?> getTodaySales(@AuthenticationPrincipal MemberDetails memberDetails) {
+		OrderSalesSumDetail sales = orderService.getSaleSumByStoreId(memberDetails);
+
+		return ResponseEntity
+			.status(HttpStatus.OK)
+			.body(
+				ApiUtils.success(
+					sales
+				)
+			);
+	}
+
+	@GetMapping("/top-sales")
+	@Operation(summary = "오늘의 매출 상위 5개 주점 조회", description = "오늘의 매출이 가장 높은 상위 5개 주점을 조회합니다.")
+	@ApiResponse(responseCode = "200", description = "오늘의 매출 상위 5개 주점 조회 성공")
+	public ResponseEntity<?> getTopSalesStores(@AuthenticationPrincipal MemberDetails memberDetails) {
+		List<TopSalesStoresDetail> topSalesStoresDetail =  orderService.getTop5StoresBySalesToday(memberDetails);
+
+		return ResponseEntity
+			.status(HttpStatus.OK)
+			.body(
+				ApiUtils.success(
+					topSalesStoresDetail
+				)
+			);
+	}
 }
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java
@@ -9,6 +9,8 @@
 import com.nowait.applicationadmin.order.dto.OrderResponseDto;
 import com.nowait.applicationadmin.order.dto.OrderStatusUpdateResponseDto;
 import com.nowait.common.enums.Role;
+import com.nowait.domaincorerdb.order.dto.OrderSalesSumDetail;
+import com.nowait.domaincorerdb.order.dto.TopSalesStoresDetail;
 import com.nowait.domaincorerdb.order.entity.OrderStatus;
 import com.nowait.domaincorerdb.order.entity.UserOrder;
 import com.nowait.domaincorerdb.order.exception.OrderNotFoundException;
@@ -33,27 +35,50 @@ public class OrderService {
 
 	@Transactional(readOnly = true)
 	public List<OrderResponseDto> findAllOrders(Long storeId, MemberDetails memberDetails) {
-		User user =  userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
-		storeRepository.findByStoreIdAndDeletedFalse(storeId)
-			.orElseThrow(StoreNotFoundException::new);
+		User user = userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
+		storeRepository.findByStoreIdAndDeletedFalse(storeId).orElseThrow(StoreNotFoundException::new);
 		if (!Role.SUPER_ADMIN.equals(user.getRole()) && !user.getStoreId().equals(storeId)) {
 			throw new OrderViewUnauthorizedException();
 		}
-		return orderRepository.findAllByStore_StoreId(storeId).stream()
+		return orderRepository.findAllByStore_StoreId(storeId)
+			.stream()
 			.map(OrderResponseDto::fromEntity)
 			.collect(Collectors.toList());
 	}
 
 	@Transactional
 	public OrderStatusUpdateResponseDto updateOrderStatus(Long orderId, OrderStatus newStatus,
 		MemberDetails memberDetails) {
-		User user =  userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
-		UserOrder userOrder = orderRepository.findById(orderId)
-			.orElseThrow(OrderNotFoundException::new);
+		User user = userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
+		UserOrder userOrder = orderRepository.findById(orderId).orElseThrow(OrderNotFoundException::new);
 		if (!Role.SUPER_ADMIN.equals(user.getRole()) && !user.getStoreId().equals(userOrder.getStore().getStoreId())) {
 			throw new OrderUpdateUnauthorizedException();
 		}
 		userOrder.updateStatus(newStatus);
 		return OrderStatusUpdateResponseDto.fromEntity(userOrder);
 	}
+
+	@Transactional(readOnly = true)
+	public OrderSalesSumDetail getSaleSumByStoreId(MemberDetails memberDetails) {
+		User user = userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
+		Long storeId = user.getStoreId();
+
+		if (!Role.SUPER_ADMIN.equals(user.getRole()) && !user.getStoreId().equals(storeId)) {
+			throw new OrderViewUnauthorizedException();
+		}
+
+		return orderRepository.findSalesSumByStoreId(storeId);
+	}
+
+	@Transactional(readOnly = true)
+	public List<TopSalesStoresDetail> getTop5StoresBySalesToday(MemberDetails memberDetails) {
+		User user = userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
+		Long storeId = user.getStoreId();
+
+		if (!Role.SUPER_ADMIN.equals(user.getRole()) && !user.getStoreId().equals(storeId)) {
+			throw new OrderViewUnauthorizedException();
+		}
+
+		return orderRepository.getTop4PlusMine(storeId);
+	}
 }
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/controller/StorePaymentController.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/controller/StorePaymentController.java
@@ -1,4 +1,4 @@
-package com.nowait.applicationadmin.storePayment.controller;
+package com.nowait.applicationadmin.storepayment.controller;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -10,10 +10,10 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentCreateRequest;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentCreateResponse;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentUpdateRequest;
-import com.nowait.applicationadmin.storePayment.service.StorePaymentService;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentCreateRequest;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentCreateResponse;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentUpdateRequest;
+import com.nowait.applicationadmin.storepayment.service.StorePaymentService;
 import com.nowait.common.api.ApiUtils;
 import com.nowait.domaincorerdb.user.entity.MemberDetails;
 
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateRequest.java
@@ -1,4 +1,5 @@
-package com.nowait.applicationadmin.storePayment.dto;
+package com.nowait.applicationadmin.storepayment.dto;
+
 
 import com.nowait.domaincorerdb.storepayment.entity.StorePayment;
 
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateResponse.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateResponse.java
@@ -1,4 +1,4 @@
-package com.nowait.applicationadmin.storePayment.dto;
+package com.nowait.applicationadmin.storepayment.dto;
 
 import java.time.LocalDateTime;
 
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentReadDto.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentReadDto.java
@@ -1,4 +1,4 @@
-package com.nowait.applicationadmin.storePayment.dto;
+package com.nowait.applicationadmin.storepayment.dto;
 
 import java.time.LocalDateTime;
 
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentUpdateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.nowait.applicationadmin.storePayment.dto;
+package com.nowait.applicationadmin.storepayment.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentService.java
@@ -1,9 +1,9 @@
-package com.nowait.applicationadmin.storePayment.service;
+package com.nowait.applicationadmin.storepayment.service;
 
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentCreateRequest;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentCreateResponse;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentReadDto;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentUpdateRequest;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentCreateRequest;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentCreateResponse;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentReadDto;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentUpdateRequest;
 import com.nowait.domaincorerdb.user.entity.MemberDetails;
 
 public interface StorePaymentService {
diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java
@@ -1,12 +1,12 @@
-package com.nowait.applicationadmin.storePayment.service;
+package com.nowait.applicationadmin.storepayment.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentCreateRequest;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentCreateResponse;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentReadDto;
-import com.nowait.applicationadmin.storePayment.dto.StorePaymentUpdateRequest;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentCreateRequest;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentCreateResponse;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentReadDto;
+import com.nowait.applicationadmin.storepayment.dto.StorePaymentUpdateRequest;
 import com.nowait.common.enums.Role;
 import com.nowait.domaincorerdb.storepayment.entity.StorePayment;
 import com.nowait.domaincorerdb.storepayment.exception.StorePaymentAlreadyExistsException;
diff --git a/nowait-common/src/main/java/com/nowait/common/api/ApiResult.java b/nowait-common/src/main/java/com/nowait/common/api/ApiResult.java
@@ -19,7 +19,5 @@ public T getResponse() {
 		return response;
 	}
 
-	public ApiError getError() {
-		return error;
-	}
+	// public ApiError getError() { return success ? null : error; }
 }
diff --git a/nowait-domain/domain-core-rdb/build.gradle b/nowait-domain/domain-core-rdb/build.gradle
@@ -31,14 +31,20 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
+    //QueryDsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
     // SWAGGER
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 
     compileOnly 'org.projectlombok:lombok:1.18.26'
     annotationProcessor 'org.projectlombok:lombok:1.18.26'
 
     // Jackson
-    api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'           // Jackson 핵심
+    api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
     api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
 
     testImplementation 'org.junit.jupiter:junit-jupiter'
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/config/QueryDslConfig.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/config/QueryDslConfig.java
@@ -0,0 +1,20 @@
+package com.nowait.domaincorerdb.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
+@Configuration
+public class QueryDslConfig {
+	@PersistenceContext
+	private EntityManager entityManager;
+
+	@Bean
+	public JPAQueryFactory jpaQueryFactory() {
+		return new JPAQueryFactory(entityManager);
+	}
+}
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/department/entity/Department.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/department/entity/Department.java
@@ -0,0 +1,24 @@
+package com.nowait.domaincorerdb.department.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "departments")
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class Department {
+
+	@Id
+	private Long id;
+
+	@Column(nullable = false)
+	private String name;
+}
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/dto/OrderSalesSumDetail.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/dto/OrderSalesSumDetail.java
@@ -0,0 +1,21 @@
+package com.nowait.domaincorerdb.order.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class OrderSalesSumDetail {
+	private Long storeId;
+	private Integer todaySalesSum;
+	private Integer yesterdaySalesSum;
+	private Integer cumulativeSalesBeforeYesterday;
+
+	public OrderSalesSumDetail(Long storeId, Integer todaySalesSum, Integer yesterdaySalesSum,
+		Integer cumulativeSalesBeforeYesterday) {
+		this.storeId = storeId;
+		this.todaySalesSum = todaySalesSum;
+		this.yesterdaySalesSum = yesterdaySalesSum;
+		this.cumulativeSalesBeforeYesterday = cumulativeSalesBeforeYesterday;
+	}
+}
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/dto/TopSalesStoresDetail.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/dto/TopSalesStoresDetail.java
@@ -0,0 +1,25 @@
+package com.nowait.domaincorerdb.order.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class TopSalesStoresDetail {
+	private Long storeId;
+	private String storeName;
+	private Long departmentId;
+	private String departmentName;
+	private Integer totalSales;
+	private Long storeRank;
+
+	public TopSalesStoresDetail(Long storeId, String storeName, Long departmentId, String departmentName, Integer totalSales,
+		Long storeRank) {
+		this.storeId = storeId;
+		this.storeName = storeName;
+		this.departmentId = departmentId;
+		this.departmentName = departmentName;
+		this.totalSales = totalSales;
+		this.storeRank = storeRank;
+	}
+}
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderCustomRepository.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderCustomRepository.java
@@ -0,0 +1,13 @@
+package com.nowait.domaincorerdb.order.repository;
+
+import java.util.List;
+
+import com.nowait.domaincorerdb.order.dto.OrderSalesSumDetail;
+import com.nowait.domaincorerdb.order.dto.TopSalesStoresDetail;
+
+public interface OrderCustomRepository {
+
+	OrderSalesSumDetail findSalesSumByStoreId(Long storeId);
+
+	List<TopSalesStoresDetail> getTop4PlusMine(Long storeId);
+}
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderCustomRepositoryImpl.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderCustomRepositoryImpl.java
diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderRepository.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderRepository.java
diff --git a/nowait-domain/domain-redis/build.gradle b/nowait-domain/domain-redis/build.gradle
diff --git a/nowait-domain/domain-redis/src/main/java/com/nowait/domaincoreredis/config/RedisConfig.java b/nowait-domain/domain-redis/src/main/java/com/nowait/domaincoreredis/config/RedisConfig.java
diff --git a/nowait-domain/domain-redis/src/main/java/com/nowait/domaincoreredis/service/StoreRankCacheService.java b/nowait-domain/domain-redis/src/main/java/com/nowait/domaincoreredis/service/StoreRankCacheService.java
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.nowait.applicationadmin.storePayment.dto;`
	`1`	`+package com.nowait.applicationadmin.storepayment.dto;`
`2`	`2`
`3`	`3`	`import java.time.LocalDateTime;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,5 @@ public T getResponse() {`
`19`	`19`	`return response;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public ApiError getError() {`
`23`		`- return error;`
`24`		`- }`
	`22`	`+ // public ApiError getError() { return success ? null : error; }`
`25`	`23`	`}`