[BE] [FEAT] 베팅 정산 시스템 고도화 및 낙관적 락 재시도 어노테이션 도입

backend/src/main/java/org/sejongisc/backend/betting/entity/BetRound.java

@@ -105,6 +105,12 @@ public boolean isClosed() {
         return !this.status;
     }
 
+    // 라운드가 무승부로 종료되었는지 여부 반환
+    // TODO: flyway 도입 시 BetOption에 DRAW 상태 추가 고려
+    public boolean isDraw() {
+        return this.settleAt != null && this.resultOption == null;
+    }
+
     // 베팅 시작
     public void open() {
         this.status = true;
@@ -152,7 +158,8 @@ public void settle(BigDecimal finalPrice) {
     // 결과 판정 로직 - 이전 종가와 비교하여 상승/하락 결정
     private BetOption determineResult(BigDecimal finalPrice) {
         int compare = finalPrice.compareTo(previousClosePrice);
-        if (compare >= 0) return BetOption.RISE;
-        return BetOption.FALL;
+        if (compare > 0) return BetOption.RISE;
+        else if (compare < 0) return BetOption.FALL;
+        return null;
     }
 }

backend/src/main/java/org/sejongisc/backend/betting/entity/UserBet.java

@@ -70,6 +70,12 @@ public void lose() {
         this.betStatus = BetStatus.CLOSED;
     }
 
+    public void draw() {
+        this.payoutPoints = this.stakePoints;
+        this.isCorrect = false;
+        this.betStatus = BetStatus.CLOSED;
+    }
+
     // 취소 상태 변경 메서드
     public void cancel() {
         this.betStatus = BetStatus.DELETED;

backend/src/main/java/org/sejongisc/backend/betting/repository/UserBetRepository.java

@@ -3,6 +3,8 @@
 import org.sejongisc.backend.betting.entity.BetRound;
 import org.sejongisc.backend.betting.entity.UserBet;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -11,11 +13,14 @@
 public interface UserBetRepository extends JpaRepository<UserBet, UUID> {
     Optional<UserBet> findByRoundAndUserId(BetRound round, UUID userId);
 
-    Optional<UserBet> findByUserBetIdAndUserId(UUID userBetId, UUID userId);
+    @Query(
+        "SELECT ub FROM UserBet ub " +
+        "JOIN FETCH ub.round " +
+        "WHERE ub.userBetId = :userBetId " +
+        "AND ub.userId = :userId")
+    Optional<UserBet> findByUserBetIdAndUserIdWithRound(@Param("userBetId") UUID userBetId, @Param("userId") UUID userId);
 
     List<UserBet> findAllByUserIdOrderByRound_SettleAtDesc(UUID userId);
 
-    List<UserBet> findAllByRound(BetRound round);
-
-
+    List<UserBet> findAllByRoundIn(List<BetRound> rounds);
 }

backend/src/main/java/org/sejongisc/backend/betting/service/BettingScheduler.java

@@ -6,6 +6,10 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+
 @Component
 @Slf4j
 @RequiredArgsConstructor
@@ -14,33 +18,23 @@ public class BettingScheduler {
     private final BettingService bettingService;
 
     @Scheduled(cron = "0 0 9 * * MON-FRI", zone = "Asia/Seoul")
-    public void dailyOpenScheduler() {
+    public void openScheduler() {
+        // 일일 라운드 생성
         bettingService.createBetRound(Scope.DAILY);
-//        log.info("✅ 스케줄러 정상 작동 중: {}", LocalDateTime.now());
-    }
 
-    @Scheduled(cron = "0 0 9 * * MON", zone = "Asia/Seoul")
-    public void weeklyOpenScheduler() {
-        bettingService.createBetRound(Scope.WEEKLY);
+        // 월요일: 주간 라운드 생성
+        if (LocalDate.now(ZoneId.of("Asia/Seoul")).getDayOfWeek() == DayOfWeek.MONDAY) {
+            bettingService.createBetRound(Scope.WEEKLY);
+        }
     }
 
     @Scheduled(cron = "0 0 22 * * MON-FRI", zone = "Asia/Seoul")
-    public void dailyCloseScheduler() {
-        bettingService.closeBetRound();
-    }
-
-    @Scheduled(cron = "0 0 22 * * FRI", zone = "Asia/Seoul")
-    public void weeklyCloseScheduler() {
+    public void closeScheduler() {
         bettingService.closeBetRound();
     }
 
     @Scheduled(cron = "0 5 22 * * MON-FRI", zone = "Asia/Seoul")
-    public void dailySettleScheduler() {
-        bettingService.settleUserBets();
-    }
-
-    @Scheduled(cron = "0 5 22 * * FRI", zone = "Asia/Seoul")
-    public void weeklySettleScheduler() {
+    public void settleScheduler() {
         bettingService.settleUserBets();
     }