feats

src/main/java/com/xiaoniu/niucai/service/impl/TaCustomerBettingServiceImpl.java

@@ -39,7 +39,8 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
         QueryWrapper<TaCustomerBetting> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("lottery_id", lottery.getLotteryId());
         queryWrapper.eq("issue_no", lotteryResult.getIssueNo());
-        queryWrapper.eq("is_open", false);
+        queryWrapper.eq("is_drawn", 1);
+        queryWrapper.eq("is_open", 0);
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
 
         List<TaCustomerBetting> list = list(queryWrapper);

src/main/java/com/xiaoniu/niucai/service/impl/TaLotteryResultServiceImpl.java

@@ -53,9 +53,9 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void checkAndSetLotteryPrize() throws Exception {
-        LocalDateTime now = LocalDateTime.now();
-        String today = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        int weekDay = now.getDayOfWeek().getValue();
+        LocalDateTime yestoday = LocalDateTime.now().minusDays(1); // DateUtils.str2LocalDateTime("2020-10-26 00:00", "yyyy-MM-dd HH:mm"); //
+        String today = yestoday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        int weekDay = yestoday.getDayOfWeek().getValue();
         List<TdLotteryOnSale> onSaleList = iTdLotteryOnSaleService.getByWeekDay(weekDay);
         if (null == onSaleList || onSaleList.size() == 0) {
             log.info(today + "未找到有开售设置");
@@ -127,17 +127,16 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
         return result;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     private void validLotteryCustomer(TdLottery lottery, List<TdLotteryPrize> prizeSettings, TaLotteryResult lotteryResult, TaCustomerBetting customerBetting) throws Exception {
         TaBettingPlan taBettingPlan = customerBetting.getBettingPlan();
         if (null == taBettingPlan) {
-            log.error(String.format("ID %s 的投注没有投注方案", customerBetting.getBettingId()));
-            return;
+            throw new Exception(String.format("ID %s 的投注没有投注方案", customerBetting.getBettingId()));
         }
 
         if (null == taBettingPlan.getItemList() || taBettingPlan.getItemList().size() == 0
                 || null == customerBetting.getItemList() || customerBetting.getItemList().size() == 0) {
-            log.error(String.format("ID %s 的投注没有投注明细", customerBetting.getBettingId()));
-            return;
+            throw new Exception(String.format("ID %s 的投注没有投注明细", customerBetting.getBettingId()));
         }
 
         int winTotalCharges = 0;
@@ -147,181 +146,162 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
             // 中奖金额
             int winAmount = 0;
 
-            try {
-                TaCustomerBettingItem bettingItem = getBettingItemMap(customerBetting.getItemList(), item);
-                if (bettingItem == null) {
-                    log.error(String.format("ID %s 的投注查询映射投注明细失败", customerBetting.getBettingId()));
-                    continue;
-                }
-
-                // 排列三直选, 排列五 都是依靠比对数字位是否一致来决定是否中奖的
-                if (lottery.getLotteryId().equals("p5")) {
-                    isWinning = BizUtils.checkPrizeNumStrict(lotteryResult.getFirstResult().split(","), item.getFirstNums().split(","));
-                    if (isWinning) {
-                        TaLotteryResultDetail resultDetail = lotteryResult.getDetailList().get(0);
-                        if (null == resultDetail) {
-                            log.error(String.format("第 %s 期排列五结果明细未抓取", lotteryResult.getIssueNo()));
-                            continue;
-                        }
+            TaCustomerBettingItem bettingItem = getBettingItemMap(customerBetting.getItemList(), item);
+            if (bettingItem == null) {
+                throw new Exception(String.format("ID %s 的投注查询映射投注明细失败", customerBetting.getBettingId()));
+            }
 
-                        winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
-                    }
-                } else if (lottery.getLotteryId().equals("p3")) {
-                    String[] bingoNums = lotteryResult.getFirstResult().split(",");
-                    if (bingoNums.length != 3) {
-                        log.error(String.format("第 %s 期排列三抓取结果不正确", lotteryResult.getIssueNo()));
-                        continue;
+            // 排列三直选, 排列五 都是依靠比对数字位是否一致来决定是否中奖的
+            if (lottery.getLotteryId().equals("p5")) {
+                isWinning = BizUtils.checkPrizeNumStrict(lotteryResult.getResult().split(","), item.getFirstNums().split(","));
+                if (isWinning) {
+                    TaLotteryResultDetail resultDetail = lotteryResult.getDetailList().get(0);
+                    if (null == resultDetail) {
+                        throw new Exception(String.format("第 %s 期排列五结果明细未抓取", lotteryResult.getIssueNo()));
                     }
 
-                    String level = "直选";
-                    if ("组选3".equals(item.getPlayWay())) {
-                        level = "组三";
-                    } else if ("组选6".equals(item.getPlayWay())) {
-                        level = "组六";
-                    }
+                    winAmount = Math.round(Float.parseFloat(resultDetail.getMoney().replaceAll(",", "")) * 100);
+                }
+            } else if (lottery.getLotteryId().equals("p3")) {
+                String[] bingoNums = lotteryResult.getResult().split(",");
+                if (bingoNums.length != 3) {
+                    throw new Exception(String.format("第 %s 期排列三抓取结果不正确", lotteryResult.getIssueNo()));
+                }
 
-                    TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), level);
-                    if (null == resultDetail) {
-                        log.error(String.format("第 %s 期排列三结果明细未抓取", lotteryResult.getIssueNo()));
-                        continue;
-                    }
+//                String level = "直选";
+//                if ("组选3".equals(item.getPlayWay())) {
+//                    level = "组选三";
+//                } else if ("组选6".equals(item.getPlayWay())) {
+//                    level = "组选六";
+//                }
+
+                String stdP0 = "直选";
+                String stdP3 = "组选3";
+                String stdP6 = "组选6";
+                String level = StringUtils.ifNull(item.getPlayWay(), stdP0);
+
+                TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), level);
+                if (null == resultDetail) {
+                    throw new Exception(String.format("第 %s 期排列三结果明细未抓取", lotteryResult.getIssueNo()));
+                }
 
-                    // 直选是通过比对数字来校验中奖
-                    if ("直选".equals(level)) {
-                        isWinning = BizUtils.checkPrizeNumStrict(bingoNums, item.getFirstNums().split(","));
-                        if (isWinning) {
-                            winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
+                // 直选是通过比对数字来校验中奖
+                if (stdP0.equals(level)) {
+                    isWinning = BizUtils.checkPrizeNumStrict(bingoNums, item.getFirstNums().split(","));
+                    if (isWinning) {
+                        winAmount = Math.round(Float.parseFloat(resultDetail.getMoney().replaceAll(",", "")) * 100);
+                    }
+                } else {
+                    // 出现2次的号码
+                    boolean hasTwiceNum = bingoNums[0].equals(bingoNums[1])
+                            || bingoNums[0].equals(bingoNums[2])
+                            || bingoNums[1].equals(bingoNums[2]);
+
+                    // 如果存在出现2次的号码, 只有可能中组选三, 否则只有可能中组选6
+                    if (!hasTwiceNum) {
+                        if (stdP6.equals(level)) {
+                            isWinning = item.getFirstNums().contains(bingoNums[0])
+                                    && item.getFirstNums().contains(bingoNums[1])
+                                    && item.getFirstNums().contains(bingoNums[2]);
+                            if (isWinning) {
+                                winAmount = Math.round(Float.parseFloat(resultDetail.getMoney().replaceAll(",", "")) * 100);
+                            }
                         }
                     } else {
-                        // 出现2次的号码
-                        boolean hasTwiceNum = bingoNums[0].equals(bingoNums[1])
-                                || bingoNums[0].equals(bingoNums[2])
-                                || bingoNums[1].equals(bingoNums[2]);
-
-                        // 如果存在出现2次的号码, 只有可能中组选三, 否则只有可能中组选6
-                        if (!hasTwiceNum) {
-                            if ("组六".equals(level)) {
+                        if (stdP3.equals(level)) {
+                            // 如果是复式
+                            if (item.getIsMulti()) {
                                 isWinning = item.getFirstNums().contains(bingoNums[0])
                                         && item.getFirstNums().contains(bingoNums[1])
                                         && item.getFirstNums().contains(bingoNums[2]);
                                 if (isWinning) {
-                                    winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
+                                    winAmount = Math.round(Float.parseFloat(resultDetail.getMoney().replaceAll(",", "")) * 100);
                                 }
-                            }
-                        } else {
-                            if ("组三".equals(level)) {
-                                // 如果是复式
-                                if (item.getIsMulti()) {
-                                    isWinning = item.getFirstNums().contains(bingoNums[0])
-                                            && item.getFirstNums().contains(bingoNums[1])
-                                            && item.getFirstNums().contains(bingoNums[2]);
-                                    if (isWinning) {
-                                        winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
-                                    }
-                                } else {
-                                    // 投注号
-                                    String[] buyNums = item.getFirstNums().split(",");
-                                    // 由小到大排序
-                                    Arrays.sort(bingoNums);
-                                    Arrays.sort(buyNums);
-
-                                    isWinning = BizUtils.checkPrizeNumStrict(bingoNums, buyNums);
-                                    if (isWinning) {
-                                        winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
-                                    }
+                            } else {
+                                // 投注号
+                                String[] buyNums = item.getFirstNums().split(",");
+                                // 由小到大排序
+                                Arrays.sort(bingoNums);
+                                Arrays.sort(buyNums);
+
+                                isWinning = BizUtils.checkPrizeNumStrict(bingoNums, buyNums);
+                                if (isWinning) {
+                                    winAmount = Math.round(Float.parseFloat(resultDetail.getMoney().replaceAll(",", "")) * 100);
                                 }
                             }
                         }
                     }
+                }
 
-                } else {
-                    // 大乐透  双色球
-                    String firstNums = item.getFirstNums();
-                    if (StringUtils.isEmpty(firstNums)) {
-                        log.error(String.format("ID %s 的投注明细无前区内容", customerBetting.getBettingId()));
-                        continue;
-                    }
+            } else {
+                // 大乐透  双色球
+                String firstNums = item.getFirstNums();
+                if (StringUtils.isEmpty(firstNums)) {
+                    throw new Exception(String.format("ID %s 的投注明细无前区内容", customerBetting.getBettingId()));
+                }
 
-                    String firstDanNums = item.getFirstDan();
-                    if (StringUtils.isEmpty(firstDanNums)) {
-                        firstDanNums = "";
-                    }
+                String firstDanNums = item.getFirstDan();
 
-                    // 前区中奖数
-                    int firstSameNums = BizUtils.getSameNums(
-                            lotteryResult.getFirstResult().split(","),
-                            firstNums.split(","),
-                            firstDanNums.split(",")
-                    );
-
-                    String secondNums = item.getFirstNums();
-                    if (StringUtils.isEmpty(secondNums)) {
-                        log.error(String.format("ID %s 的投注明细无后区内容", customerBetting.getBettingId()));
-                        continue;
-                    }
+                // 前区中奖数
+                int firstSameNums = BizUtils.getSameNums(
+                        lotteryResult.getFirstResult().split(","),
+                        firstNums.split(","),
+                        StringUtils.isEmpty(firstDanNums) ? null : firstDanNums.split(",")
+                );
 
-                    String secondDanNums = item.getFirstDan();
-                    if (StringUtils.isEmpty(secondDanNums)) {
-                        secondDanNums = "";
-                    }
+                String secondNums = item.getSecondNums();
+                if (StringUtils.isEmpty(secondNums)) {
+                    throw new Exception(String.format("ID %s 的投注明细无后区内容", customerBetting.getBettingId()));
+                }
 
-                    // 后区中奖数
-                    int secondSameNums = BizUtils.getSameNums(
-                            lotteryResult.getSecondResult().split(","),
-                            secondNums.split(","),
-                            secondDanNums.split(","));
-
-                    // 选择结果
-                    String curNums = String.format("%d-%d", firstSameNums, secondSameNums);
-
-                    boolean needContinue = false;
-                    TdLotteryPrize bingo = null;
-                    for(TdLotteryPrize prize : prizeSettings) {
-                        if (StringUtils.isEmpty(prize.getBingoRule())) {
-                            log.error(String.format("彩种 %s 的中奖结果规则未维护", lottery.getLotteryId()));
-                            needContinue = true;
-                            break;
-                        }
+                String secondDanNums = item.getSecondDan();
 
-                        if (prize.getBingoRule().contains(curNums)) {
-                            bingo = prize;
-                            break;
-                        }
+                // 后区中奖数
+                int secondSameNums = BizUtils.getSameNums(
+                        lotteryResult.getSecondResult().split(","),
+                        secondNums.split(","),
+                        StringUtils.isEmpty(secondDanNums) ? null : secondDanNums.split(",")
+                );
+
+                // 选择结果
+                String curNums = String.format("%d-%d", firstSameNums, secondSameNums);
+
+                TdLotteryPrize bingo = null;
+                for(TdLotteryPrize prize : prizeSettings) {
+                    if (StringUtils.isEmpty(prize.getBingoRule())) {
+                        throw new Exception(String.format("彩种 %s 的中奖结果规则未维护", lottery.getLotteryId()));
                     }
 
-                    if (needContinue) {
-                        continue;
+                    if (prize.getBingoRule().contains(curNums)) {
+                        bingo = prize;
+                        break;
                     }
+                }
 
-                    if (null != bingo) {
-                        log.info(String.format("恭喜 %s 购买 %s 中了 %s", customerBetting.getCustomerId(), lottery.getLotteryId(), bingo.getLevel()));
-                        isWinning = true;
-                        bettingItem.setWinLevel(bingo.getLevel());
-                        TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), bingo.getLevel());
-                        if (null == resultDetail) {
-                            log.error(String.format("彩种 %s 的中奖结果明细未成功抓取", lottery.getLotteryId()));
-                            continue;
-                        }
+                if (null != bingo) {
+                    log.info(String.format("恭喜 %s 购买 %s 中了 %s", customerBetting.getCustomerId(), lottery.getLotteryId(), bingo.getLevel()));
+                    isWinning = true;
+                    bettingItem.setWinLevel(bingo.getLevel());
+                    TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), bingo.getLevel());
+                    if (null == resultDetail) {
+                        throw new Exception(String.format("彩种 %s 的中奖结果明细未成功抓取", lottery.getLotteryId()));
+                    }
 
-                        winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
-                        // 是否追加
-                        boolean isAdd = customerBetting.getIsAdd();
-                        if (isAdd && !StringUtils.isEmpty(resultDetail.getXMoney())) {
-                            winAmount += Math.round(Float.parseFloat(resultDetail.getXMoney()) * 100);
-                        }
+                    winAmount = Math.round(Float.parseFloat(resultDetail.getMoney().replaceAll(",", "")) * 100);
+                    // 是否追加
+                    boolean isAdd = customerBetting.getIsAdd();
+                    if (isAdd && !StringUtils.isEmpty(resultDetail.getXMoney())) {
+                        winAmount += Math.round(Float.parseFloat(resultDetail.getXMoney().replaceAll(",", "")) * 100);
                     }
                 }
-
-                winTotalCharges += winAmount;
-                bettingItem.setIsOpen(true);
-                bettingItem.setOpeningDate(DateUtils.today());
-                bettingItem.setIsWinning(isWinning);
-                bettingItem.setWinAmount(winAmount);
-                iTaCustomerBettingItemService.updateById(bettingItem);
-            } catch (Exception e) {
-                e.printStackTrace();
-                continue;
             }
+
+            winTotalCharges += winAmount;
+            bettingItem.setIsOpen(true);
+            bettingItem.setOpeningDate(DateUtils.today());
+            bettingItem.setIsWinning(isWinning);
+            bettingItem.setWinAmount(winAmount);
+            iTaCustomerBettingItemService.updateById(bettingItem);
         }
 
         if (winTotalCharges > 0) {

src/main/java/com/xiaoniu/niucai/service/impl/TaMatchServiceImpl.java

@@ -9,6 +9,7 @@ import com.xiaoniu.niucai.enums.SportOpeningStatusEnum;
 import com.xiaoniu.niucai.mapper.TaCustomerBettingMapper;
 import com.xiaoniu.niucai.service.*;
 import com.xiaoniu.niucai.mapper.TaMatchMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -25,6 +26,7 @@ import java.util.List;
  * @author admin
  * @since 2020-09-02
  */
+@Slf4j
 @Service
 public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> implements ITaMatchService {
     @Autowired
@@ -55,14 +57,15 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
     public void checkAndSetSportPrize() throws Exception {
         List<TaMatch> matchList = taMatchMapper.getLastOpenAndUndoMatch(3);
         if (null == matchList || matchList.size() == 0) {
+            log.info("未检测到有待处理的竞彩比赛");
             return;
         }
 
         for (TaMatch taMatch : matchList) {
             try {
+                validateMatch(taMatch);
                 taMatch.setOpeningStatus(SportOpeningStatusEnum.DOING.getCode());
                 updateById(taMatch);
-                validateMatch(taMatch);
             } catch (Exception e) {
                 // TODO 比如错误日志记录
                 taMatch.setOpeningStatus(SportOpeningStatusEnum.READY.getCode());

src/main/java/com/xiaoniu/niucai/task/Lottery.java

@@ -20,7 +20,7 @@ public class Lottery {
     /**
      * 开奖轮询
      */
-    @Scheduled(cron = "* 0/3 * * * ? ")
+    @Scheduled(cron = "* 0/2 * * * ? ")
     public void lotteryOpenCheck() {
         // 数字彩
         try {

src/main/resources/mapper/TaMatchMapper.xml

@@ -8,9 +8,9 @@
         FROM
             ta_match t
         WHERE
-            t.`status` > 1
+            t.`status` = 3
             AND t.opening_status = 0
-            AND t.match_date >= DATE_FORMAT( CURRENT_DATE - #{days}, '%Y-%m-%d' )
+            AND t.match_date >= DATE_FORMAT( CURRENT_DATE - #{days}, '%Y-%m-%d' )
         ORDER BY
             t.match_id ASC
     </select>