feats

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

@@ -1,4 +1,91 @@
 package com.yunzhi.niucai.common;
 
+
+import java.util.Arrays;
+
 public class ArrayUtils {
+
+    /**
+     * 抽取 数组 中指定部分内容, 返回新数组
+     * @param src
+     * @param start
+     * @param end
+     * @param <T>
+     * @return
+     */
+    public static <T> T[] slice(T[] src, int start, int ... end) {
+        if (null == src) {
+            return null;
+        }
+
+        int from = start;
+        int to = -1;
+        if (end.length == 0) {
+            to = src.length;
+        } else {
+            to = end[0];
+        }
+
+        if (from < 0) {
+            from = 0;
+        }
+
+        if (from > src.length) {
+            from = src.length;
+        }
+
+        if (from > to) {
+            from = 0;
+            to = 0;
+        }
+
+        return Arrays.copyOfRange(src, from, to);
+    }
+
+    /**
+     * 合并两个数组, 返回新数组
+     * @param a1
+     * @param a2
+     * @param <T>
+     * @return
+     */
+    public static <T> T[] join(T[] a1, T[] a2) {
+        if (a1 == null && a2 == null) {
+            return null;
+        }
+
+        if (a1 == null) {
+            return slice(a2, 0);
+        }
+
+        if (a2 == null) {
+            return slice(a1, 0);
+        }
+
+        T[] res = Arrays.copyOf(a1, a1.length + a2.length);
+        System.arraycopy(a2, 0, res, a1.length, a2.length);
+        return res;
+    }
+
+    /**
+     * 从数组指定位置删除一个元素, 返回新数组
+     * @param src
+     * @param index
+     * @param <T>
+     * @return
+     */
+    public static <T> T[] omit(T[] src, int index) {
+        return join(slice(src, 0, index), slice(src,index + 1));
+    }
+
+    /**
+     * indexOf
+     * @param src
+     * @param search
+     * @param <T>
+     * @return
+     */
+    public static <T> int indexOf(T[] src, T search) {
+        return Arrays.asList(src).indexOf(search);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.niucai.common;
 import io.swagger.models.auth.In;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -113,15 +114,75 @@ public class BizUtils {
         return EncryptUtils.combination(leftSize, canUse);
     }
 
-    public static int getSameNums(List<String> tar, List<String> src, List<String> dan) {
-        if (null == tar || tar.size() == 0) {
+    /**
+     * 获取相同号码数量
+     * @param tar 对比目标
+     * @param src 数据源
+     * @param dan 胆拖数据
+     * @return
+     */
+    public static int getSameNums(String[] tar, String[] src, String[] dan) {
+        if (null == tar || tar.length == 0) {
             return 0;
         }
 
-        if (null == src && src.size() == 0) {
+        if (null == src && src.length == 0) {
             return 0;
         }
 
-        return 0;
+        String[] tarArr = ArrayUtils.slice(tar, 0);
+        String[] srcArr = ArrayUtils.slice(src, 0);
+        String[] danArr = null == dan ? new String[0] : ArrayUtils.slice(dan, 0);
+
+        int danNum = 0;
+        int maxSrcNum = tarArr.length - danArr.length;
+        int srcNum = 0;
+
+        for (String t : tarArr) {
+            int danInx = ArrayUtils.indexOf(danArr, t);
+            if (danInx > -1) {
+                danNum += 1;
+                danArr = ArrayUtils.omit(danArr, danInx);
+                continue;
+            }
+
+            int srcInx = ArrayUtils.indexOf(srcArr, t);
+            if (srcInx > -1) {
+                srcNum += 1;
+                srcArr = ArrayUtils.omit(srcArr, srcInx);
+            }
+        }
+
+        if (srcNum > maxSrcNum) {
+            srcNum = maxSrcNum;
+        }
+
+        return srcNum + danNum;
+    }
+
+    /**
+     * 校验是否中奖, 目前只有 排列三直选, 排列五 用到
+     * @param tar
+     * @param src
+     * @return
+     */
+    public static boolean checkPrizeNumStrict(String[] tar, String[] src) {
+        if (null == tar || tar.length == 0 || null == src || src.length == 0) {
+            return false;
+        }
+
+        if (tar.length != src.length) {
+            return false;
+        }
+
+        for (int i = 0; i < tar.length; i++) {
+            String num = tar[i];
+            String[] srcList = src[i].split(" ");
+            if (!Arrays.asList(srcList).contains(num)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 }

src/main/java/com/yunzhi/niucai/entity/TaCustomerBetting.java

@@ -96,12 +96,19 @@ public class TaCustomerBetting implements Serializable {
     @ApiModelProperty(value = "中奖金额 单位分")
     private Integer winAmount;
 
+    @ApiModelProperty(value = "是否派奖")
+    private Boolean isCashed;
+
     @ApiModelProperty(value = "投注时间")
     private LocalDateTime createDate;
 
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "投注明细")
+    @TableField(exist = false)
+    List<TaCustomerBettingItem> itemList;
+
     @ApiModelProperty(value = "体彩相关明细")
     @TableField(exist = false)
     List<TaCustomerBettingSport> bettingSports;

src/main/java/com/yunzhi/niucai/entity/TaCustomerBettingItem.java

@@ -0,0 +1,61 @@
+package com.yunzhi.niucai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 客户投注明细 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaCustomerBettingItem对象", description="客户投注明细 ")
+public class TaCustomerBettingItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "明细ID")
+    @TableId(value = "item_no", type = IdType.AUTO)
+    private Integer itemNo;
+
+    @ApiModelProperty(value = "投注ID")
+    private Integer bettingId;
+
+    @ApiModelProperty(value = "对应方案明细")
+    private Integer planItemNo;
+
+    @ApiModelProperty(value = "是否开奖")
+    private Boolean isOpen;
+
+    @ApiModelProperty(value = "开奖日期")
+    private String openingDate;
+
+    @ApiModelProperty(value = "是否中奖")
+    private Boolean isWinning;
+
+    @ApiModelProperty(value = "中奖等级")
+    private String winLevel;
+
+    @ApiModelProperty(value = "中奖金额 单位分")
+    private Integer winAmount;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+
+}

src/main/java/com/yunzhi/niucai/entity/TaLotteryResult.java

@@ -1,9 +1,11 @@
 package com.yunzhi.niucai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -89,5 +91,7 @@ public class TaLotteryResult implements Serializable {
     @ApiModelProperty("状态")
     private Integer status;
 
-
+    @ApiModelProperty("结果明细")
+    @TableField(exist = false)
+    List<TaLotteryResultDetail> detailList;
 }

src/main/java/com/yunzhi/niucai/entity/TaLotteryResultDetail.java

@@ -0,0 +1,58 @@
+package com.yunzhi.niucai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 数字彩开奖明细 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaLotteryResultDetail对象", description="数字彩开奖明细 ")
+public class TaLotteryResultDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "结果ID")
+    private Integer resultNo;
+
+    @ApiModelProperty(value = "等级")
+    private String level;
+
+    @ApiModelProperty(value = "注数")
+    private String piece;
+
+    @ApiModelProperty(value = "单注奖金")
+    private String money;
+
+    @ApiModelProperty(value = "追加注数")
+    private String xPiece;
+
+    @ApiModelProperty(value = "追加奖金")
+    private String xMoney;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "状态")
+    private Boolean status;
+
+
+}

src/main/java/com/yunzhi/niucai/entity/TdLotteryPrize.java

@@ -38,6 +38,9 @@ public class TdLotteryPrize implements Serializable {
     @ApiModelProperty(value = "玩法")
     private String playWay;
 
+    @ApiModelProperty(value = "数字彩中奖规则")
+    private String bingoRule;
+
     @ApiModelProperty(value = "场次")
     private Boolean round;
 

src/main/java/com/yunzhi/niucai/mapper/TaCustomerBettingItemMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.niucai.mapper;
+
+import com.yunzhi.niucai.entity.TaCustomerBettingItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户投注明细  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+@Mapper
+public interface TaCustomerBettingItemMapper extends BaseMapper<TaCustomerBettingItem> {
+
+}

src/main/java/com/yunzhi/niucai/mapper/TaLotteryResultDetailMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.niucai.mapper;
+
+import com.yunzhi.niucai.entity.TaLotteryResultDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 数字彩开奖明细  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+@Mapper
+public interface TaLotteryResultDetailMapper extends BaseMapper<TaLotteryResultDetail> {
+
+}

src/main/java/com/yunzhi/niucai/service/ITaCustomerBettingItemService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.niucai.service;
+
+import com.yunzhi.niucai.entity.TaCustomerBettingItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 客户投注明细  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+public interface ITaCustomerBettingItemService extends IService<TaCustomerBettingItem> {
+
+}

src/main/java/com/yunzhi/niucai/service/ITaLotteryResultDetailService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.niucai.service;
+
+import com.yunzhi.niucai.entity.TaLotteryResultDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 数字彩开奖明细  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+public interface ITaLotteryResultDetailService extends IService<TaLotteryResultDetail> {
+
+}

src/main/java/com/yunzhi/niucai/service/ITaLotteryResultService.java

@@ -19,4 +19,6 @@ public interface ITaLotteryResultService extends IService<TaLotteryResult> {
     List<TaLotteryResult> getLastResult() throws Exception;
 
     TaLotteryResult getLastResultByLottery(TdLottery tdLottery) throws Exception;
+
+    TaLotteryResult getResultBy(TdLottery lottery, String today) throws Exception;
 }

src/main/java/com/yunzhi/niucai/service/ITdLotteryPrizeService.java

@@ -1,8 +1,11 @@
 package com.yunzhi.niucai.service;
 
+import com.yunzhi.niucai.entity.TdLottery;
 import com.yunzhi.niucai.entity.TdLotteryPrize;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 彩种中奖设置  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITdLotteryPrizeService extends IService<TdLotteryPrize> {
 
+    List<TdLotteryPrize> getByLottery(TdLottery lottery) throws Exception;
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.niucai.service.impl;
+
+import com.yunzhi.niucai.entity.TaCustomerBettingItem;
+import com.yunzhi.niucai.mapper.TaCustomerBettingItemMapper;
+import com.yunzhi.niucai.service.ITaCustomerBettingItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户投注明细  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+@Service
+public class TaCustomerBettingItemServiceImpl extends ServiceImpl<TaCustomerBettingItemMapper, TaCustomerBettingItem> implements ITaCustomerBettingItemService {
+
+}

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

@@ -3,6 +3,7 @@ package com.yunzhi.niucai.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.entity.*;
 import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.mapper.TaCustomerBettingItemMapper;
 import com.yunzhi.niucai.mapper.TaCustomerBettingMapper;
 import com.yunzhi.niucai.mapper.TaCustomerBettingSportMapper;
 import com.yunzhi.niucai.service.ITaBettingPlanService;
@@ -30,6 +31,9 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
     @Autowired
     ITaBettingPlanService iTaBettingPlanService;
 
+    @Autowired
+    TaCustomerBettingItemMapper taCustomerBettingItemMapper;
+
     @Autowired
     TaCustomerBettingSportMapper taCustomerBettingSportMapper;
 
@@ -63,11 +67,20 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
 
         if (null != plan.getItemList()) {
             for (TaBettingPlanItem item: plan.getItemList()) {
+                TaCustomerBettingItem bettingItem = new TaCustomerBettingItem();
+                bettingItem.setBettingId(taCustomerBetting.getBettingId());
+                bettingItem.setPlanItemNo(item.getItemNo());
+                bettingItem.setStatus(StatusEnum.NORMAL.getCode());
+
+                if (taCustomerBettingItemMapper.insert(bettingItem) < 1) {
+                    throw new Exception("生成我的投注明细失败");
+                }
+
                 if (null != item.getDetailList()) {
                     for (TaBettingPlanSportDetail detail: item.getDetailList()) {
                         TaCustomerBettingSport bettingSport = new TaCustomerBettingSport();
                         bettingSport.setBettingId(taCustomerBetting.getBettingId());
-                        bettingSport.setItemNo(item.getItemNo());
+                        bettingSport.setItemNo(bettingItem.getItemNo());
                         bettingSport.setDetailNo(detail.getSerialNo());
                         bettingSport.setMatchId(item.getMatchId());
                         bettingSport.setRuleCode(detail.getRuleCode());
@@ -92,9 +105,11 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
             throw new Exception("数据不存在, 投注ID不正确");
         }
 
-        // 查询明细
-        List<TaCustomerBettingSport> bettingSports = getBettingSportByBetting(betting);
-        betting.setBettingSports(bettingSports);
+        // 投注明细
+        betting.setItemList(getBettingItemByBetting(betting));
+
+        // 竞彩明细
+        betting.setBettingSports(getBettingSportByBetting(betting));
 
         // 查询方案
         TaBettingPlan taBettingPlan = iTaBettingPlanService.getDetailOfPlanById(betting.getPlanId());
@@ -120,7 +135,7 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
                 if (lottery.getIsSport()) {
                     betting.setBettingSports(getBettingSportByBetting(betting));
                 }
-
+                betting.setItemList(getBettingItemByBetting(betting));
                 betting.setBettingPlan(iTaBettingPlanService.getDetailOfPlanById(betting.getPlanId()));
             }
         }
@@ -136,4 +151,13 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
 
         return taCustomerBettingSportMapper.selectList(queryWrapper);
     }
+
+    private List<TaCustomerBettingItem> getBettingItemByBetting(TaCustomerBetting betting) throws Exception {
+        QueryWrapper<TaCustomerBettingItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("betting_id", betting.getBettingId());
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("serial_no");
+
+        return taCustomerBettingItemMapper.selectList(queryWrapper);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.niucai.service.impl;
+
+import com.yunzhi.niucai.entity.TaLotteryResultDetail;
+import com.yunzhi.niucai.mapper.TaLotteryResultDetailMapper;
+import com.yunzhi.niucai.service.ITaLotteryResultDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 数字彩开奖明细  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-14
+ */
+@Service
+public class TaLotteryResultDetailServiceImpl extends ServiceImpl<TaLotteryResultDetailMapper, TaLotteryResultDetail> implements ITaLotteryResultDetailService {
+
+}

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

@@ -1,15 +1,16 @@
 package com.yunzhi.niucai.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.niucai.common.BizUtils;
 import com.yunzhi.niucai.common.CommConstants;
+import com.yunzhi.niucai.common.DateUtils;
+import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.entity.*;
 import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.mapper.TaLotteryResultDetailMapper;
 import com.yunzhi.niucai.mapper.TaLotteryResultMapper;
-import com.yunzhi.niucai.service.ITaCustomerBettingService;
-import com.yunzhi.niucai.service.ITaLotteryResultService;
+import com.yunzhi.niucai.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yunzhi.niucai.service.ITdLotteryOnSaleService;
-import com.yunzhi.niucai.service.ITdLotteryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,9 +40,18 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
     @Autowired
     ITaCustomerBettingService iTaCustomerBettingService;
 
+    @Autowired
+    ITaCustomerBettingItemService iTaCustomerBettingItemService;
+
+    @Autowired
+    ITdLotteryPrizeService iTdLotteryPrizeService;
+
     @Autowired
     TaLotteryResultMapper taLotteryResultMapper;
 
+    @Autowired
+    TaLotteryResultDetailMapper taLotteryResultDetailMapper;
+
     @Override
     public List<TaLotteryResult> getLastResult() throws Exception {
         return taLotteryResultMapper.getLastResult();
@@ -58,6 +68,11 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
         return getOne(queryWrapper);
     }
 
+    @Override
+    public TaLotteryResult getResultBy(TdLottery lottery, String today) throws Exception {
+        return null;
+    }
+
     /**
      * 校验客户是否中奖, 如果中奖，则进行中奖相关更新
      * @throws Exception
@@ -68,7 +83,7 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
         int weekDay = now.getDayOfWeek().getValue();
         List<TdLotteryOnSale> onSaleList = iTdLotteryOnSaleService.getByWeekDay(weekDay);
         if (null == onSaleList || onSaleList.size() == 0) {
-            log.info(today + "未找到有开奖设置");
+            log.info(today + "未找到有开售设置");
             return;
         }
 
@@ -79,6 +94,13 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
             // 彩种字典
             TdLottery lottery = iTdLotteryService.getById(lotteryId);
 
+            // 中奖设置
+            List<TdLotteryPrize> prizeSettings = iTdLotteryPrizeService.getByLottery(lottery);
+            if (null == prizeSettings && prizeSettings.size() == 0) {
+                log.error(String.format("彩种 %s 没有开奖相关设置", lotteryId));
+                continue;
+            }
+
             // 当前彩种的开奖结果
             TaLotteryResult lotteryResult = getLotteryResultBy(onSale.getLotteryId(), today);
             if (null == lotteryResult) {
@@ -86,67 +108,419 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
                 continue;
             }
 
-            switch (lotteryId) {
-                case CommConstants.LOTTERY_LOTTERY:
-                    validLotteryCustomer(lottery, lotteryResult);
-                    break;
-                case CommConstants.LOTTERY_P3:
-                    validP3Customer(lottery, lotteryResult);
-                    break;
-                case CommConstants.LOTTERY_P5:
-                    validP5Customer(lottery, lotteryResult);
-                    break;
-                case CommConstants.LOTTERY_DOUBLE:
-                    validDoubleCustomer(lottery, lotteryResult);
-                    break;
-                case CommConstants.LOTTERY_FOOTBALL:
-                    validFootballCustomer(lottery, lotteryResult);
-                    break;
-                case CommConstants.LOTTERY_BASKETBALL:
-                    validBasketballCustomer(lottery, lotteryResult);
-                    break;
-                default:
-                    break;
+            if (null == lotteryResult.getDetailList() || lotteryResult.getDetailList().size() == 0) {
+                log.error(String.format("彩种 %s 未抓取到开奖明细结果", lotteryId));
+                continue;
+            }
+
+            // 当前彩种的投注列表
+            List<TaCustomerBetting> customerBettingList = iTaCustomerBettingService.getAllUnOpenBettingsBy(lottery, lotteryResult);
+            if (null == customerBettingList || customerBettingList.size() == 0) {
+                log.info(String.format("彩种 %s 本期无人投注", lotteryId));
+                continue;
+            }
+
+            // 遍历校验中奖情况
+            for (TaCustomerBetting customerBetting : customerBettingList) {
+                try {
+                    switch (lotteryId) {
+                        case CommConstants.LOTTERY_LOTTERY:
+                            validLotteryCustomer(lottery, prizeSettings, lotteryResult, customerBetting);
+                            break;
+                        case CommConstants.LOTTERY_P3:
+                            validP3Customer(lottery, prizeSettings, lotteryResult, customerBetting);
+                            break;
+                        case CommConstants.LOTTERY_P5:
+                            validP5Customer(lottery, prizeSettings, lotteryResult, customerBetting);
+                            break;
+                        case CommConstants.LOTTERY_DOUBLE:
+                            validDoubleCustomer(lottery, prizeSettings, lotteryResult, customerBetting);
+                            break;
+                        case CommConstants.LOTTERY_FOOTBALL:
+                            validFootballCustomer(lottery, prizeSettings, lotteryResult, customerBetting);
+                            break;
+                        case CommConstants.LOTTERY_BASKETBALL:
+                            validBasketballCustomer(lottery, prizeSettings, lotteryResult, customerBetting);
+                            break;
+                        default:
+                            break;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    continue;
+                }
             }
         }
     }
 
-    private void validLotteryCustomer(TdLottery lottery, TaLotteryResult lotteryResult) throws Exception {
-        List<TaCustomerBetting> customerBettingList = iTaCustomerBettingService.getAllUnOpenBettingsBy(lottery, lotteryResult);
-        if (null == customerBettingList || customerBettingList.size() == 0) {
-            log.info(String.format("大乐透 %s 期无人投注", lotteryResult.getIssueNo()));
+    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;
         }
-        
-        for (TaCustomerBetting customerBetting : customerBettingList) {
-            TaBettingPlan taBettingPlan = customerBetting.getBettingPlan();
-            if (null == taBettingPlan) {
-                log.error(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;
+        }
+
+        int winTotalCharges = 0;
+        for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
+            try {
+                TaCustomerBettingItem bettingItem = getBettingItemMap(customerBetting.getItemList(), item);
+                if (bettingItem == null) {
+                    log.error(String.format("ID %s 的投注查询映射投注明细失败", customerBetting.getBettingId()));
+                    continue;
+                }
+
+                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 = "";
+                }
+
+                // 前区中奖数
+                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;
+                }
+
+                String secondDanNums = item.getFirstDan();
+                if (StringUtils.isEmpty(secondDanNums)) {
+                    secondDanNums = "";
+                }
+
+                // 后区中奖数
+                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("大乐透的中奖结果规则未维护");
+                        needContinue = true;
+                        break;
+                    }
+
+                    if (prize.getBingoRule().contains(curNums)) {
+                        bingo = prize;
+                        break;
+                    }
+                }
+
+                if (needContinue) {
+                    continue;
+                }
+
+                bettingItem.setIsOpen(true);
+                if (null != bingo) {
+                    log.info(String.format("恭喜 %s 大乐透中了 %s", customerBetting.getCustomerId(), bingo.getLevel()));
+                    bettingItem.setIsWinning(true);
+                    bettingItem.setWinLevel(bingo.getLevel());
+                    TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), bingo.getLevel());
+                    if (null == resultDetail) {
+                        log.error("大乐透的中奖结果明细未成功抓取");
+                        continue;
+                    }
+
+                    int 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);
+                    }
+                    bettingItem.setWinAmount(winAmount);
+
+                    winTotalCharges += winAmount;
+                } else {
+                    bettingItem.setIsWinning(false);
+                }
+
+                iTaCustomerBettingItemService.updateById(bettingItem);
+            } catch (Exception e) {
+                e.printStackTrace();
                 continue;
             }
+        }
 
-            if (null == taBettingPlan.getItemList() || taBettingPlan.getItemList().size() == 0) {
-                log.error(String.format("ID %s 的投注没有投注明细", customerBetting.getBettingId()));
-                continue;
+        if (winTotalCharges > 0) {
+            customerBetting.setIsWinning(true);
+            customerBetting.setWinAmount(winTotalCharges * customerBetting.getBettingTimes());
+        } else {
+            customerBetting.setIsWinning(false);
+        }
+        customerBetting.setIsOpen(true);
+        customerBetting.setOpeningDate(DateUtils.today());
+        iTaCustomerBettingService.updateById(customerBetting);
+    }
+
+    private TaLotteryResultDetail filterResultDetail(List<TaLotteryResultDetail> detailList, String level) {
+        for (TaLotteryResultDetail d: detailList) {
+            if (d.getLevel().equals(level)) {
+                return d;
             }
+        }
 
+        return null;
+    }
 
+    private TaCustomerBettingItem getBettingItemMap(List<TaCustomerBettingItem> bettingItemList, TaBettingPlanItem item) {
+        for (TaCustomerBettingItem it : bettingItemList) {
+            if (item.getItemNo().equals(it.getPlanItemNo())) {
+                return it;
+            }
         }
+        return null;
     }
 
-    private void validP3Customer(TdLottery lottery, TaLotteryResult lotteryResult) throws Exception {
+    private void validP3Customer(TdLottery lottery, List<TdLotteryPrize> prizeSettings, TaLotteryResult lotteryResult, TaCustomerBetting customerBetting) throws Exception {
     }
 
-    private void validP5Customer(TdLottery lottery, TaLotteryResult lotteryResult) throws Exception {
+    private void validP5Customer(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;
+        }
+
+        if (null == taBettingPlan.getItemList() || taBettingPlan.getItemList().size() == 0
+                || null == customerBetting.getItemList() || customerBetting.getItemList().size() == 0) {
+            log.error(String.format("ID %s 的投注没有投注明细", customerBetting.getBettingId()));
+            return;
+        }
+
+        int winTotalCharges = 0;
+        for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
+            try {
+                TaCustomerBettingItem bettingItem = getBettingItemMap(customerBetting.getItemList(), item);
+                if (bettingItem == null) {
+                    log.error(String.format("ID %s 的投注查询映射投注明细失败", customerBetting.getBettingId()));
+                    continue;
+                }
+
+                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 = "";
+                }
+
+                // 前区中奖数
+                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;
+                }
+
+                String secondDanNums = item.getFirstDan();
+                if (StringUtils.isEmpty(secondDanNums)) {
+                    secondDanNums = "";
+                }
+
+                // 后区中奖数
+                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("双色球的中奖结果规则未维护");
+                        needContinue = true;
+                        break;
+                    }
+
+                    if (prize.getBingoRule().contains(curNums)) {
+                        bingo = prize;
+                        break;
+                    }
+                }
+
+                if (needContinue) {
+                    continue;
+                }
+
+                bettingItem.setIsOpen(true);
+                if (null != bingo) {
+                    log.info(String.format("恭喜 %s 双色球中了 %s", customerBetting.getCustomerId(), bingo.getLevel()));
+                    bettingItem.setIsWinning(true);
+                    bettingItem.setWinLevel(bingo.getLevel());
+                    TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), bingo.getLevel());
+                    if (null == resultDetail) {
+                        log.error("双色球的中奖结果明细未成功抓取");
+                        continue;
+                    }
+
+                    int winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
+                    bettingItem.setWinAmount(winAmount);
+                    winTotalCharges += winAmount;
+                } else {
+                    bettingItem.setIsWinning(false);
+                }
+
+                iTaCustomerBettingItemService.updateById(bettingItem);
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+        }
+
+        if (winTotalCharges > 0) {
+            customerBetting.setIsWinning(true);
+            customerBetting.setWinAmount(winTotalCharges * customerBetting.getBettingTimes());
+        } else {
+            customerBetting.setIsWinning(false);
+        }
+        customerBetting.setIsOpen(true);
+        customerBetting.setOpeningDate(DateUtils.today());
+        iTaCustomerBettingService.updateById(customerBetting);
     }
 
-    private void validDoubleCustomer(TdLottery lottery, TaLotteryResult lotteryResult) throws Exception {
+    private void validDoubleCustomer(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;
+        }
+
+        if (null == taBettingPlan.getItemList() || taBettingPlan.getItemList().size() == 0
+                || null == customerBetting.getItemList() || customerBetting.getItemList().size() == 0) {
+            log.error(String.format("ID %s 的投注没有投注明细", customerBetting.getBettingId()));
+            return;
+        }
+
+        int winTotalCharges = 0;
+        for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
+            try {
+                TaCustomerBettingItem bettingItem = getBettingItemMap(customerBetting.getItemList(), item);
+                if (bettingItem == null) {
+                    log.error(String.format("ID %s 的投注查询映射投注明细失败", customerBetting.getBettingId()));
+                    continue;
+                }
+
+                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 = "";
+                }
+
+                // 前区中奖数
+                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;
+                }
+
+                String secondDanNums = item.getFirstDan();
+                if (StringUtils.isEmpty(secondDanNums)) {
+                    secondDanNums = "";
+                }
+
+                // 后区中奖数
+                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("双色球的中奖结果规则未维护");
+                        needContinue = true;
+                        break;
+                    }
+
+                    if (prize.getBingoRule().contains(curNums)) {
+                        bingo = prize;
+                        break;
+                    }
+                }
+
+                if (needContinue) {
+                    continue;
+                }
+
+                bettingItem.setIsOpen(true);
+                if (null != bingo) {
+                    log.info(String.format("恭喜 %s 双色球中了 %s", customerBetting.getCustomerId(), bingo.getLevel()));
+                    bettingItem.setIsWinning(true);
+                    bettingItem.setWinLevel(bingo.getLevel());
+                    TaLotteryResultDetail resultDetail = filterResultDetail(lotteryResult.getDetailList(), bingo.getLevel());
+                    if (null == resultDetail) {
+                        log.error("双色球的中奖结果明细未成功抓取");
+                        continue;
+                    }
+
+                    int winAmount = Math.round(Float.parseFloat(resultDetail.getMoney()) * 100);
+                    bettingItem.setWinAmount(winAmount);
+                    winTotalCharges += winAmount;
+                } else {
+                    bettingItem.setIsWinning(false);
+                }
+
+                iTaCustomerBettingItemService.updateById(bettingItem);
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+        }
+
+        if (winTotalCharges > 0) {
+            customerBetting.setIsWinning(true);
+            customerBetting.setWinAmount(winTotalCharges * customerBetting.getBettingTimes());
+        } else {
+            customerBetting.setIsWinning(false);
+        }
+        customerBetting.setIsOpen(true);
+        customerBetting.setOpeningDate(DateUtils.today());
+        iTaCustomerBettingService.updateById(customerBetting);
     }
 
-    private void validFootballCustomer(TdLottery lottery, TaLotteryResult lotteryResult) throws Exception {
+    private void validFootballCustomer(TdLottery lottery, List<TdLotteryPrize> prizeSettings, TaLotteryResult lotteryResult, TaCustomerBetting customerBetting) throws Exception {
     }
 
-    private void validBasketballCustomer(TdLottery lottery, TaLotteryResult lotteryResult) throws Exception {
+    private void validBasketballCustomer(TdLottery lottery, List<TdLotteryPrize> prizeSettings, TaLotteryResult lotteryResult, TaCustomerBetting customerBetting) throws Exception {
     }
 
     public TaLotteryResult getLotteryResultBy(String lotteryId, String openingDate) throws Exception {
@@ -154,6 +528,16 @@ public class TaLotteryResultServiceImpl extends ServiceImpl<TaLotteryResultMappe
         queryWrapper.eq("lottery_id", lotteryId);
         queryWrapper.eq("opening_date", openingDate);
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
-        return getOne(queryWrapper);
+
+        TaLotteryResult result = getOne(queryWrapper);
+        if (null != result) {
+            QueryWrapper<TaLotteryResultDetail> query2 = new QueryWrapper<>();
+            query2.eq("result_no", result.getSerialNo());
+            query2.eq("status", StatusEnum.NORMAL.getCode());
+            query2.orderByAsc("serial_no");
+            result.setDetailList(taLotteryResultDetailMapper.selectList(query2));
+        }
+
+        return result;
     }
 }

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

@@ -1,11 +1,16 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.niucai.entity.TdLottery;
 import com.yunzhi.niucai.entity.TdLotteryPrize;
+import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TdLotteryPrizeMapper;
 import com.yunzhi.niucai.service.ITdLotteryPrizeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 彩种中奖设置  服务实现类
@@ -17,4 +22,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class TdLotteryPrizeServiceImpl extends ServiceImpl<TdLotteryPrizeMapper, TdLotteryPrize> implements ITdLotteryPrizeService {
 
+    @Override
+    public List<TdLotteryPrize> getByLottery(TdLottery lottery) throws Exception {
+        QueryWrapper<TdLotteryPrize> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("lottery_id", lottery.getLotteryId());
+        queryWrapper.eq("statsu", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("serial_no");
+
+        return list(queryWrapper);
+    }
 }

src/main/resources/mapper/TaCustomerBettingItemMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.niucai.mapper.TaCustomerBettingItemMapper">
+
+</mapper>

src/main/resources/mapper/TaLotteryResultDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.niucai.mapper.TaLotteryResultDetailMapper">
+
+</mapper>