版本更新 更改抽奖配置和代码优化

src/main/java/com/miya/draw/manager/DrawManagerImpl.java

@@ -82,7 +82,7 @@ public class DrawManagerImpl implements IDrawManager {
         }
 
         LocalDateTime nowTime = LocalDateTime.now();
-        LocalDateTime start = LocalDateTimeUtil.beginOfDay(nowTime);
+        LocalDateTime start = nowTime.minusDays(3);
         LocalDateTime end = LocalDateTimeUtil.endOfDay(nowTime);
         Integer maxDrawCountLimit = businessConfig.getDrawMaxCount();
         Integer alreadyDrawCount = accountPrizeService.gainAlreadyDrawCount(request.getPhone(), start, end);
@@ -158,7 +158,7 @@ public class DrawManagerImpl implements IDrawManager {
             lock.tryLock(5, 10, TimeUnit.SECONDS);
             // 1 验证是否可以抽奖
             LocalDateTime nowTime = LocalDateTime.now();
-            LocalDateTime start = LocalDateTime.now().minusDays(3);
+            LocalDateTime start = nowTime.minusDays(3);
             LocalDateTime end = LocalDateTimeUtil.endOfDay(nowTime);
             List<SyncTrade> buyGoodList = syncTradeService.listCanDrawGoods(phone, start, end, activityStoreService.listAllActivityStoreId(), activityGoodsService.listAllActivityGoods());
             BigDecimal buyTotal = gainBuyTotal(buyGoodList);
@@ -174,6 +174,9 @@ public class DrawManagerImpl implements IDrawManager {
             if (drawCountTotal - alreadyDrawCount > 0) {
                 // 获得奖品
                 List<Prize> prizeList = prizeService.listAllPrizes();
+                if (CollectionUtils.isEmpty(prizeList)) {
+                    throw new BusinessException(ErrorEnum.DRAW_CHECK_EXP, "活动已结束!");
+                }
                 // 抽奖
                 prize = selectCoupon(prizeList);
                 // 乐观锁效验抽到的奖品它合不合规