Bläddra i källkod

Merge branch 'dev'

xiongzhu 3 år sedan
förälder
incheckning
b42d1fbd78

+ 2 - 0
src/main/java/com/izouma/nineth/repo/WithdrawApplyRepo.java

@@ -20,4 +20,6 @@ public interface WithdrawApplyRepo extends JpaRepository<WithdrawApply, Long>, J
     int countByUserIdAndCreatedAtBetween(Long userId, LocalDateTime start, LocalDateTime end);
 
     List<WithdrawApply> findByCreatedAtBetweenAndStatus(LocalDateTime start, LocalDateTime end, WithdrawStatus status);
+
+    List<WithdrawApply> findByCreatedAtBeforeAndStatus(LocalDateTime start, WithdrawStatus status);
 }

+ 2 - 2
src/main/java/com/izouma/nineth/service/WithdrawApplyService.java

@@ -166,8 +166,8 @@ public class WithdrawApplyService {
     @RedisLock(value = "'approveAll'", expire = 1, unit = TimeUnit.HOURS)
     public void approveAll() throws ExecutionException, InterruptedException {
         new ForkJoinPool(5).submit(() -> {
-            withdrawApplyRepo.findByCreatedAtBetweenAndStatus(LocalDate.now().minusDays(1).atStartOfDay(),
-                            LocalDate.now().minusDays(1).atTime(LocalTime.MAX), WithdrawStatus.PENDING)
+            withdrawApplyRepo.findByCreatedAtBeforeAndStatus(LocalDate.now().minusDays(1).atStartOfDay(),
+                            WithdrawStatus.PENDING)
                     .parallelStream().forEach(withdrawApply -> {
                         try {
                             finishWithdrawApply(withdrawApply.getId(), true, null);