merge

src/main/java/com/yunzhi/niucai/common/ArrayUtils.java

@@ -88,4 +88,5 @@ public class ArrayUtils {
     public static <T> int indexOf(T[] src, T search) {
         return Arrays.asList(src).indexOf(search);
     }
+
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -96,7 +97,7 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
 
             // 中奖设置
             List<TdLotteryPrize> prizeSettings = iTdLotteryPrizeService.getByLottery(lottery);
-            if (null == prizeSettings && prizeSettings.size() == 0) {
+            if (null == prizeSettings || prizeSettings.size() == 0) {
                 log.error(String.format("彩种 %s 没有开奖相关设置", lotteryId));
                 continue;
             }
@@ -150,7 +151,7 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
 //                    }
                 } catch (Exception e) {
                     e.printStackTrace();
-                    continue;
+                    // continue;
                 }
             }
         }
@@ -171,6 +172,11 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
 
         int winTotalCharges = 0;
         for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
+            // 是否中奖
+            boolean isWinning = false;
+            // 中奖金额
+            int winAmount = 0;
+
             try {
                 TaCustomerBettingItem bettingItem = getBettingItemMap(customerBetting.getItemList(), item);
                 if (bettingItem == null) {
@@ -178,28 +184,25 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                     continue;
                 }
 
-                String firstNums = item.getFirstNums();
-                if (StringUtils.isEmpty(firstNums)) {
-                    log.error(String.format("ID %s 的投注明细无前区内容", customerBetting.getBettingId()));
-                    continue;
-                }
-
-                // 中奖金额
-                int winAmount = 0;
-                // 是否中奖
-                boolean isWinning = false;
-
-                // 排列五
+                // 排列三直选, 排列五 都是依靠比对数字位是否一致来决定是否中奖的
                 if (lottery.getLotteryId().equals(CommConstants.LOTTERY_P5)) {
-                    TaLotteryResultDetail resultDetail = lotteryResult.getDetailList().get(0);
-                    isWinning = BizUtils.checkPrizeNumStrict(lotteryResult.getFirstResult().split(","), firstNums.split(","));
+                    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;
+                        }
+
                         winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
-                        bettingItem.setWinAmount(winAmount);
                     }
-
-                // 排列三
                 } else if (lottery.getLotteryId().equals(CommConstants.LOTTERY_P3)) {
+                    String[] bingoNums = lotteryResult.getFirstResult().split(",");
+                    if (bingoNums.length != 3) {
+                        log.error(String.format("第 %s 期排列三抓取结果不正确", lotteryResult.getIssueNo()));
+                        continue;
+                    }
+
                     String level = "直选";
                     if ("组选3".equals(item.getPlayWay())) {
                         level = "组三";
@@ -208,22 +211,67 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                     }
 
                     TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), level);
-                    switch (level) {
-                        case "直选":
-                            isWinning = BizUtils.checkPrizeNumStrict(lotteryResult.getFirstResult().split(","), firstNums.split(","));
-                            break;
-                        case "组三":
-
-                            break;
-                        case "组六":
-                            break;
+                    if (null == resultDetail) {
+                        log.error(String.format("第 %s 期排列三结果明细未抓取", lotteryResult.getIssueNo()));
+                        continue;
                     }
 
-                    if (isWinning) {
-                        winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
-                        bettingItem.setWinAmount(winAmount);
+                    // 直选是通过比对数字来校验中奖
+                    if ("直选".equals(level)) {
+                        isWinning = BizUtils.checkPrizeNumStrict(bingoNums, item.getFirstNums().split(","));
+                        if (isWinning) {
+                            winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 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)) {
+                                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 {
+                            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 firstNums = item.getFirstNums();
+                    if (StringUtils.isEmpty(firstNums)) {
+                        log.error(String.format("ID %s 的投注明细无前区内容", customerBetting.getBettingId()));
+                        continue;
+                    }
+
                     String firstDanNums = item.getFirstDan();
                     if (StringUtils.isEmpty(firstDanNums)) {
                         firstDanNums = "";
@@ -248,7 +296,10 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                     }
 
                     // 后区中奖数
-                    int secondSameNums = BizUtils.getSameNums(lotteryResult.getSecondResult().split(","), secondNums.split(","), secondDanNums.split(","));
+                    int secondSameNums = BizUtils.getSameNums(
+                            lotteryResult.getSecondResult().split(","),
+                            secondNums.split(","),
+                            secondDanNums.split(","));
 
                     // 选择结果
                     String curNums = String.format("%d-%d", firstSameNums, secondSameNums);
@@ -257,7 +308,7 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                     TdLotteryPrize bingo = null;
                     for(TdLotteryPrize prize : prizeSettings) {
                         if (StringUtils.isEmpty(prize.getBingoRule())) {
-                            log.error(String.format("彩种 %s 中奖结果规则未维护", lottery.getLotteryId()));
+                            log.error(String.format("彩种 %s 的中奖结果规则未维护", lottery.getLotteryId()));
                             needContinue = true;
                             break;
                         }
@@ -272,14 +323,13 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                         continue;
                     }
 
-                    bettingItem.setIsOpen(true);
                     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("大乐透的中奖结果明细未成功抓取");
+                            log.error(String.format("彩种 %s 的中奖结果明细未成功抓取", lottery.getLotteryId()));
                             continue;
                         }
 
@@ -292,9 +342,11 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                     }
                 }
 
+                winTotalCharges += winAmount;
+                bettingItem.setIsOpen(true);
+                bettingItem.setOpeningDate(DateUtils.today());
                 bettingItem.setIsWinning(isWinning);
                 bettingItem.setWinAmount(winAmount);
-                winTotalCharges += winAmount;
                 iTaCustomerBettingItemService.updateById(bettingItem);
             } catch (Exception e) {
                 e.printStackTrace();