From adb1a1e7fa5ad3a5e8a65ec6aa7a7c5a9ff87982 Mon Sep 17 00:00:00 2001
From: hoon7566 <hoon7566@gmail.com>
Date: Wed, 23 Mar 2022 18:21:24 +0900
Subject: [PATCH] =?UTF-8?q?fix(order=20service):=20=EB=8C=80=EC=8B=9C?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=ED=86=B5=EA=B3=84=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 대시보드 통계 쿼리 수정
---
 customer-vue/src/views/OrderPage.vue           |  3 +--
 .../repository/OrderRepositoryCustom.java      | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/customer-vue/src/views/OrderPage.vue b/customer-vue/src/views/OrderPage.vue
index a13093c..f4e4bd5 100644
--- a/customer-vue/src/views/OrderPage.vue
+++ b/customer-vue/src/views/OrderPage.vue
@@ -101,7 +101,6 @@ export default {
             this.orderData=response.data.data
           })
           .catch(error=>{
-            alert("장바구니에 상품이 없습니다.")
             this.$router.back();
             console.log(error.response)
           })
@@ -114,7 +113,7 @@ export default {
           .then(response=>{
             console.log(response)
             alert(response.data.data+"삭제되었습니다.")
-            vm.orderData.orderPrice -=orderItem.price
+            vm.orderData.orderPrice -=orderItem.price* orderItem.count
             vm.orderData.orderItemDtoList.splice(
                 vm.orderData.orderItemDtoList.indexOf(orderItem),1
             )
diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java
index 71c2f2b..93648a4 100644
--- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java
+++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java
@@ -154,6 +154,8 @@ public class OrderRepositoryCustom {
                 .where(
                           order.storeId.eq(storeId)
                     .and( order.orderTime.between(startTime,today))
+                    .and(order.orderStatus.eq(OrderStatus.FINISHED))
+
                 ).fetch();
     }
 
@@ -175,7 +177,8 @@ public class OrderRepositoryCustom {
                 .from(orderItem)
                 .join(orderItem.order, order)
                 .where(orderItem.order.storeId.eq(storeId)
-                        .and(orderItem.order.orderTime.between(startTime,today)))
+                        .and(orderItem.order.orderTime.between(startTime,today))
+                        .and(orderItem.order.orderStatus.eq(OrderStatus.FINISHED)))
                 .groupBy(orderItem.itemId)
                 .orderBy(orderItem.count.sum().desc())
                 .limit(1L)
@@ -194,19 +197,20 @@ public class OrderRepositoryCustom {
 
         DateTimeTemplate formattedDate =
                 Expressions.dateTimeTemplate(LocalDateTime.class,
-                        "CAST({0} AS date) ", orderItem.order.orderTime );
+                        "CAST({0} AS date) ", order.orderTime );
 
         return queryFactory.
                 select(
                         Projections.fields(DashBoardDto.SellAmountAWeek.class,
                                 formattedDate.as("sellDate"),
-                                orderItem.price.sum().multiply(orderItem.count.sum()).as("sellAmount")
+                                order.orderPrice.sum().as("sellAmount")
                         )
                 )
-                .from(orderItem)
-                .join(orderItem.order, order)
-                .where(orderItem.order.storeId.eq(storeId)
-                        .and(orderItem.order.orderTime.between(startTime,today)))
+                .from(order)
+                .where(order.storeId.eq(storeId)
+                        .and(order.orderTime.between(startTime,today))
+                        .and(order.orderStatus.eq(OrderStatus.FINISHED))
+                )
                 .groupBy(formattedDate)
                 .fetch();