✨ feat: 주문 배송 시작 스케줄링 및 상태 업데이트 로직 추가

Author: floreo1242

src/main/java/com/jajaja/domain/order/entity/OrderProduct.java

@@ -43,4 +43,8 @@ public class OrderProduct extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "option_id")
     private ProductOption productOption;
+    
+    public void updateStatus(OrderStatus status) {
+        this.status = status;
+    }
 }

src/main/java/com/jajaja/domain/order/service/OrderCommandService.java

@@ -11,4 +11,5 @@ public interface OrderCommandService {
     OrderPrepareResponseDto prepareOrder(Long memberId, OrderPrepareRequestDto request);
     OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDto request);
     OrderRefundResponseDto refundOrder(Long memberId, OrderRefundRequestDto request);
+    void startShipping(Long orderId);
 }

src/main/java/com/jajaja/domain/order/service/OrderCommandServiceImpl.java

@@ -44,6 +44,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.HttpClientErrorException;
@@ -204,6 +205,9 @@ public OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDt
             // 최초 구매 시 포인트 지급
             pointCommandService.addFirstPurchasePointsIfPossible(member);
 
+            // 30초 후 배송 시작 스케줄링
+            scheduleShippingStart(order.getId());
+            
             return OrderApproveResponseDto.of(order);
 
         } catch (HttpClientErrorException e) { // 400번대 에러
@@ -215,6 +219,9 @@ public OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDt
         } catch (Exception e) {
             log.error("[OrderCommandService] 주문 생성 실패 - 회원ID: {}, 에러: {}", memberId, e.getMessage(), e);
             order.updateStatus(OrderStatus.ABORTED);
+            // OrderProduct도 함께 취소 상태로 변경
+            order.getOrderProducts().forEach(orderProduct -> 
+                orderProduct.updateStatus(OrderStatus.ABORTED));
             throw new GeneralException(ErrorStatus._INTERNAL_SERVER_ERROR);
         }
     }
@@ -308,6 +315,9 @@ public OrderRefundResponseDto refundOrder(Long memberId, OrderRefundRequestDto r
             }
 
             order.updateStatus(OrderStatus.REFUNDED);
+            // OrderProduct도 함께 환불 상태로 변경
+            order.getOrderProducts().forEach(orderProduct -> 
+                orderProduct.updateStatus(OrderStatus.REFUNDED));
 
             // 환불 성공 시 구매 통계에서 판매 개수만큼 수량 줄이기
             order.getOrderProducts()
@@ -333,6 +343,9 @@ public OrderRefundResponseDto refundOrder(Long memberId, OrderRefundRequestDto r
             throw new TossPaymentException(ErrorStatus.TOSS_PAYMENT_SERVER_ERROR);
         } catch (Exception e) {
             order.updateStatus(OrderStatus.REFUND_FAILED);
+            // OrderProduct도 함께 환불 실패 상태로 변경
+            order.getOrderProducts().forEach(orderProduct -> 
+                orderProduct.updateStatus(OrderStatus.REFUND_FAILED));
             log.error("[OrderCommandService] 환불 처리 실패 - 주문ID: {}, 에러: {}", request.orderId(), e.getMessage(), e);
             throw new GeneralException(ErrorStatus.REFUND_FAILED);
         }
@@ -443,4 +456,38 @@ private HttpHeaders getHeaders() {
 
         return headers;
     }
+    
+    @Async("orderTaskExecutor")
+    protected void scheduleShippingStart(Long orderId) {
+        try {
+            Thread.sleep(30000); // 30초 대기
+            startShipping(orderId);
+        } catch (InterruptedException e) {
+            log.error("[OrderCommandService] 배송 시작 스케줄링 중단 - 주문ID: {}", orderId, e);
+            Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            log.error("[OrderCommandService] 배송 시작 스케줄링 실패 - 주문ID: {}", orderId, e);
+        }
+    }
+    
+    @Override
+    @Transactional
+    public void startShipping(Long orderId) {
+        try {
+            Order order = orderRepository.findById(orderId)
+                    .orElseThrow(() -> new BadRequestException(ErrorStatus.ORDER_NOT_FOUND));
+            
+            if (order.getOrderStatus() == OrderStatus.DONE) {
+                order.updateStatus(OrderStatus.SHIPPING);
+                // OrderProduct들도 함께 배송 상태로 변경
+                order.getOrderProducts().forEach(orderProduct -> 
+                    orderProduct.updateStatus(OrderStatus.SHIPPING));
+                log.info("[OrderCommandService] 배송 시작 - 주문ID: {}", orderId);
+            } else {
+                log.warn("[OrderCommandService] 배송 시작 불가 - 주문ID: {}, 현재상태: {}", orderId, order.getOrderStatus());
+            }
+        } catch (Exception e) {
+            log.error("[OrderCommandService] 배송 시작 실패 - 주문ID: {}", orderId, e);
+        }
+    }
 }

src/main/java/com/jajaja/global/config/AsyncConfig.java

@@ -0,0 +1,24 @@
+package com.jajaja.global.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+    @Bean(name = "orderTaskExecutor")
+    public Executor orderTaskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(2);
+        executor.setMaxPoolSize(5);
+        executor.setQueueCapacity(10);
+        executor.setThreadNamePrefix("Order-Async-");
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/jajaja/global/scheduler/TeamExpireScheduler.java

@@ -7,7 +7,6 @@
 import com.jajaja.domain.notification.service.NotificationService;
 import com.jajaja.domain.order.entity.Order;
 import com.jajaja.domain.order.entity.enums.OrderStatus;
-import com.jajaja.domain.order.repository.OrderRepository;
 import com.jajaja.domain.order.service.OrderCommandService;
 import com.jajaja.domain.order.dto.request.OrderRefundRequestDto;
 import com.jajaja.domain.product.entity.Product;
@@ -74,6 +73,9 @@ public void expireTeams() {
             if (order != null) {
                 try {
                     order.updateStatus(OrderStatus.TEAM_MATCHING_FAILED);
+                    // OrderProduct도 함께 팀 매칭 실패 상태로 변경
+                    order.getOrderProducts().forEach(orderProduct -> 
+                        orderProduct.updateStatus(OrderStatus.TEAM_MATCHING_FAILED));
                     OrderRefundRequestDto refundRequest = OrderRefundRequestDto.of(order.getId(), order.getPaymentKey(),"팀 매칭 실패로 인한 자동 환불");
                     orderCommandService.refundOrder(leader.getId(), refundRequest);
                     log.info("팀 매칭 실패 주문 자동 환불 완료 - 주문ID: {}", order.getId());