From 99a9f20a34e85b429427c4ffad88965636cf2393 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Wed, 15 May 2024 16:04:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8?= =?UTF-8?q?=EC=8B=9C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=A0=81=EB=A6=BD=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/readyvery/readyverydemo/domain/Grade.java | 2 +- .../readyvery/readyverydemo/src/order/OrderServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Grade.java b/src/main/java/com/readyvery/readyverydemo/domain/Grade.java index f6d5ae1..8ce394f 100644 --- a/src/main/java/com/readyvery/readyverydemo/domain/Grade.java +++ b/src/main/java/com/readyvery/readyverydemo/domain/Grade.java @@ -6,7 +6,7 @@ @Getter @RequiredArgsConstructor public enum Grade { - + EVENT("EVENT", 0.0D), ORDA("ORDA", 4.0D), DEFAULT("Earlier", 6.3D); diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java index 4522e2f..272cacd 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java +++ b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java @@ -89,7 +89,9 @@ public OrderStatusRes completeOrder(Long id, OrderStatusUpdateReq request) { order.completeOrder(request.getStatus()); // 포인트 적립 - pointService.giveOrderPoint(order, request.getStatus()); + if (!order.getStore().getGrade().equals(Grade.EVENT)) { + pointService.giveOrderPoint(order, request.getStatus()); + } orderRepository.save(order); From 1fbdfb96274a39015f41b78bf6e67c2bf7c6c8e3 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Wed, 15 May 2024 16:07:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20Grade=20import=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/readyvery/readyverydemo/src/order/OrderServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java index 272cacd..9dd44f1 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java +++ b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java @@ -30,6 +30,7 @@ import com.readyvery.readyverydemo.config.SolApiConfig; import com.readyvery.readyverydemo.config.TossPaymentConfig; import com.readyvery.readyverydemo.domain.CeoInfo; +import com.readyvery.readyverydemo.domain.Grade; import com.readyvery.readyverydemo.domain.Order; import com.readyvery.readyverydemo.domain.Progress; import com.readyvery.readyverydemo.domain.repository.OrderRepository;