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..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; @@ -89,7 +90,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);