Merge pull request #163 from AppLinkers/develop

HOTFIX - 거래 완료 시, 거래 상태 변경 오류
AppLinkers · Jan 9, 2024 · 31b919b · 31b919b
2 parents 271e417 + 6ed3398
commit 31b919b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/com/laser/ordermanage/common/scheduler/job/ChangeStageToCompletedJob.java b/src/main/java/com/laser/ordermanage/common/scheduler/job/ChangeStageToCompletedJob.java
@@ -25,7 +25,7 @@ public void execute(JobExecutionContext context) {
             return;
         }
 
-        factoryOrderService.changeStageToCompleted(order);
+        factoryOrderService.changeStageToCompleted(orderId);
 
         factoryOrderService.sendEmailForChangeStageToCompleted(order);
     }

diff --git a/src/main/java/com/laser/ordermanage/factory/api/FactoryOrderAPI.java b/src/main/java/com/laser/ordermanage/factory/api/FactoryOrderAPI.java
@@ -116,7 +116,7 @@ public ResponseEntity<?> changeStageToProductionCompleted(@PathVariable("order-i
 
         factoryOrderService.sendEmailForChangeStageToProductionCompleted(order);
 
-        scheduleService.createJobForChangeStageToCompleted(order.getId());
+        scheduleService.createJobForChangeStageToCompleted(orderId);
 
         return ResponseEntity.ok().build();
     }
@@ -162,11 +162,11 @@ public ResponseEntity<?> changeStageToCompleted(
             throw new CustomCommonException(OrderErrorCode.INVALID_ORDER_STAGE, order.getStage().getValue());
         }
 
-        factoryOrderService.createOrderAcquirer(order, request, file);
+        factoryOrderService.createOrderAcquirer(orderId, request, file);
 
         scheduleService.removeJobForChangeStageToCompleted(order.getId());
 
-        factoryOrderService.changeStageToCompleted(order);
+        factoryOrderService.changeStageToCompleted(orderId);
 
         factoryOrderService.sendEmailForChangeStageToCompleted(order);
 

diff --git a/src/main/java/com/laser/ordermanage/factory/service/FactoryOrderService.java b/src/main/java/com/laser/ordermanage/factory/service/FactoryOrderService.java
@@ -15,6 +15,7 @@
 import com.laser.ordermanage.order.repository.AcquirerRepository;
 import com.laser.ordermanage.order.repository.QuotationRepository;
 import com.laser.ordermanage.order.service.OrderService;
+import jakarta.persistence.EntityManager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +33,8 @@ public class FactoryOrderService {
     private final MailService mailService;
     private final S3Service s3Service;
 
+    private final EntityManager entityManager;
+
     @Transactional
     public Order updateOrderIsUrgent(Long orderId, FactoryUpdateOrderIsUrgentRequest request) {
         Order order = orderService.getOrderById(orderId);
@@ -260,7 +263,8 @@ public void sendEmailForAcquirer(Long orderId, String baseUrl) {
     }
 
     @Transactional
-    public void createOrderAcquirer(Order order, FactoryCreateOrderAcquirerRequest request, MultipartFile file) {
+    public void createOrderAcquirer(Long orderId, FactoryCreateOrderAcquirerRequest request, MultipartFile file) {
+        Order order = orderService.getOrderById(orderId);
 
         String fileName = file.getOriginalFilename();
         Long fileSize = file.getSize();
@@ -281,7 +285,9 @@ public void createOrderAcquirer(Order order, FactoryCreateOrderAcquirerRequest r
     }
 
     @Transactional
-    public void changeStageToCompleted(Order order) {
+    public void changeStageToCompleted(Long orderId) {
+        Order order = orderService.getOrderById(orderId);
+
         order.changeStageToCompleted();
 
         Customer customer = order.getCustomer();