FEAT:fixing

rivopelu · Dec 4, 2024 · d06c998 · d06c998
1 parent a4237c1
commit d06c998
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java b/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java
@@ -195,12 +195,26 @@ public ResponseIdQr generateQROrder() {
 
     @Override
     public ResponseEnum createOrderViaQr(String code, ReqCreateOrderViaQrCode req) {
+
         Optional<QrCode> findQrCode = qrCodeRepository.findByCode(code);
+
         if (findQrCode.isEmpty()) {
             throw new BadRequestException(ResponseEnum.REQUEST_INVALID.name());
         }
+
+
         QrCode qrCode = findQrCode.get();
         String clientId = qrCode.getClient().getId();
+
+        Optional<Order> checkOrder = orderRepository.findById(qrCode.getOrder().getId());
+        if (checkOrder.isEmpty()) {
+            throw new NotFoundException(ResponseEnum.ORDER_NOT_FOUND.name());
+        }
+
+        if (!checkOrder.get().getStatus().equals(OrderStatusEnum.PENDING)) {
+            throw new BadRequestException(ResponseEnum.REQUEST_INVALID.name());
+        }
+
         Optional<Order> findOrder = orderRepository.findById(qrCode.getOrder().getId());
         if (findOrder.isEmpty()) {
             throw new NotFoundException(ResponseEnum.ORDER_NOT_FOUND.name());