feats

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

@@ -43,8 +43,9 @@ public class ListUtils {
             return result;
         } else {
             // 去掉第一个, 剩余的继续迭代
-            src.remove(0);
-            List<List<T>> rtnList = descartes(src);
+            List<List<T>> srcCopy = getDeepCopy(src);   // 不影响原来 list
+            srcCopy.remove(0);
+            List<List<T>> rtnList = descartes(srcCopy);
 
             for (T a : srcA) {
                 for (List<T> rtn : rtnList) {

src/main/java/com/yunzhi/niucai/controller/TaCustomerController.java

@@ -8,6 +8,7 @@ import com.yunzhi.niucai.common.ResponseBean;
 import com.yunzhi.niucai.common.SMSCaptcha;
 import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.vo.CustIdentityInfo;
 import com.yunzhi.niucai.vo.SignUpParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,29 @@ public class TaCustomerController extends BaseController {
         return ResponseBean.success("success");
     }
 
+    @PutMapping("/app/bind/identity")
+    @ApiOperation(value="绑定身份证号", notes = "绑定身份证号", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean bindIDCardNo(@ApiParam("绑定信息") @RequestBody CustIdentityInfo custIdentityInfo,
+                                        HttpServletRequest request
+                                     ) throws Exception {
+        TaCustomer taCustomer = getCustomer(request);
+        if (null == taCustomer || StatusEnum.DELETED.getCode().equals(taCustomer.getStatus())) {
+            return ResponseBean.error("未登录或者已过期, 请重新登录", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (null == custIdentityInfo
+                || StringUtils.isEmpty(custIdentityInfo.getIdCard())
+                || StringUtils.isEmpty(custIdentityInfo.getRealName())) {
+            return ResponseBean.error("用户真实姓名或者身份证号不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        taCustomer.setRealName(custIdentityInfo.getRealName());
+        taCustomer.setIdCard(custIdentityInfo.getIdCard());
+
+        iTaCustomerService.updateIdCard(taCustomer);
+        return ResponseBean.success("success");
+    }
+
 //
 //    /**
 //     * 分页查询列表

src/main/java/com/yunzhi/niucai/controller/TaMatchController.java

@@ -1,5 +1,7 @@
 package com.yunzhi.niucai.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.niucai.common.BaseController;
 import com.yunzhi.niucai.common.ResponseBean;
 import io.swagger.annotations.Api;
@@ -57,7 +59,22 @@ public class TaMatchController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/app/sport/result",method= RequestMethod.GET)
+    @ApiOperation(value="竞彩开奖结果列表", notes = "竞彩开奖结果列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getResult(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @ApiParam("彩种类型: 可用类型, 请查阅彩种字典") @RequestParam(value ="lotteryId", required = false) String lotteryId) throws Exception {
 
+        IPage<TaMatch> page = new Page<>(pageNum, pageSize);
+        IPage<TaMatch> result = iTaMatchService.getResult(page, lotteryId);
+        return ResponseBean.success(result);
+    }
 
 //
 //    /**

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

@@ -59,6 +59,11 @@ public class TaCustomer implements Serializable {
      */
     private String cashPass;
 
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
     /**
      * 身份证
      */

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

@@ -1,5 +1,6 @@
 package com.yunzhi.niucai.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.niucai.entity.TaMatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,4 +31,6 @@ public interface TaMatchMapper extends BaseMapper<TaMatch> {
     List<TaMatch> getLastResult() throws Exception;
 
     List<TaMatch> getLastOpenAndUndoMatch(@Param("days") int days) throws Exception;
+
+    IPage<TaMatch> getResult(IPage<TaMatch> page, @Param("lotteryId") String lotteryId) throws Exception;
 }

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

@@ -17,4 +17,6 @@ public interface ITaCustomerService extends IService<TaCustomer> {
     boolean signUp(SignUpParam signUpParam) throws Exception;
 
     TaCustomer getCustomerByPhone(String phone) throws Exception;
+
+    boolean updateIdCard(TaCustomer taCustomer) throws Exception;
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.niucai.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.niucai.entity.TaMatch;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,6 @@ public interface ITaMatchService extends IService<TaMatch> {
     List<TaMatch> getMixedMatch(String lottery) throws Exception;
 
     List<TaMatch> getLastResult() throws Exception;
+
+    IPage<TaMatch> getResult(IPage<TaMatch> page, String lotteryId) throws Exception;
 }

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

@@ -229,27 +229,41 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
                 throw new Exception("投注比赛场次数量不正确");
             }
 
-            List<Integer> noteNumList = new ArrayList<>();
+//            List<Integer> noteNumList = new ArrayList<>();
+            List<List<String>> noteList = new ArrayList<>();
             for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
                 validateSport(taBettingPlan, item, tdLottery);
-                noteNumList.add(item.getDetailList().size());
+//                noteNumList.add(item.getDetailList().size());
+                List<String> playList = new ArrayList<>();
+                for (TaBettingPlanSportDetail sportDetail : item.getDetailList()) {
+                    playList.add(sportDetail.getOdds());
+                }
+
+                noteList.add(playList);
             }
 
-//            // 校验注数
-//            int totalNums = BizUtils.computeSportNoteNum(tdSportPass.getUnitNum(), tdSportPass.getAmount(), noteNumList);
-//            if (null == taBettingPlan.getNotesNum() || !taBettingPlan.getNotesNum().equals(totalNums)) {
-//                throw new Exception("投注总注数计算不正确, 应该为: " + totalNums);
-//            }
-//
-//            // 总金额
-//            int totalPrice = totalNums * tdLottery.getUnitPrice() * taBettingPlan.getTimes();
-//            if (null == taBettingPlan.getTotalPrice() || !taBettingPlan.getTotalPrice().equals(totalPrice)) {
-//                throw new Exception("投注总金额计算不正确");
-//            }
-//
-//            if (totalPrice > tdLottery.getMaxPrice()) {
-//                throw new Exception("投注总金额不能超过" + String.format("%.2f", (float) tdLottery.getMaxPrice() / 100 ) + "元");
-//            }
+            // 校验注数
+            List<List<List<String>>> mockCombList = BizUtils.mockAllCombination(noteList, tdSportPass);
+            int totalNums = 0;
+            for (List<List<String>> it : mockCombList) {
+                if (null != it) {
+                    totalNums += it.size();
+                }
+            }
+
+            if (null == taBettingPlan.getNotesNum() || !taBettingPlan.getNotesNum().equals(totalNums)) {
+                throw new Exception("投注总注数计算不正确, 应该为: " + totalNums);
+            }
+
+            // 总金额
+            int totalPrice = totalNums * tdLottery.getUnitPrice() * taBettingPlan.getTimes();
+            if (null == taBettingPlan.getTotalPrice() || !taBettingPlan.getTotalPrice().equals(totalPrice)) {
+                throw new Exception("投注总金额计算不正确");
+            }
+
+            if (totalPrice > tdLottery.getMaxPrice()) {
+                throw new Exception("投注总金额不能超过" + String.format("%.2f", (float) tdLottery.getMaxPrice() / 100 ) + "元");
+            }
         }
 
         // 如果是数字彩

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

@@ -1,6 +1,7 @@
 package com.yunzhi.niucai.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yunzhi.niucai.common.EncryptUtils;
 import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.entity.TaCustomer;
@@ -118,6 +119,16 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         return getOne(queryWrapper);
     }
 
+    @Override
+    public boolean updateIdCard(TaCustomer taCustomer) throws Exception {
+        UpdateWrapper<TaCustomer> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("real_name", taCustomer.getRealName());
+        updateWrapper.set("id_card", taCustomer.getIdCard());
+        updateWrapper.eq("customer_id", taCustomer.getCustomerId());
+
+        return update(updateWrapper);
+    }
+
     private TaCustomer getByInviteCode(String inviteCode) throws Exception {
         QueryWrapper<TaCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("invite_code", inviteCode);

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

@@ -1,10 +1,14 @@
 package com.yunzhi.niucai.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.niucai.common.BizUtils;
 import com.yunzhi.niucai.common.DateUtils;
 import com.yunzhi.niucai.entity.*;
 import com.yunzhi.niucai.enums.SportOpeningStatusEnum;
 import com.yunzhi.niucai.enums.SportStatusEnum;
+import com.yunzhi.niucai.mapper.TaCustomerBettingMapper;
 import com.yunzhi.niucai.mapper.TaMatchMapper;
 import com.yunzhi.niucai.mapper.TaMatchOddsMapper;
 import com.yunzhi.niucai.service.*;
@@ -45,12 +49,21 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
     @Autowired
     ITaCustomerBettingSportService iTaCustomerBettingSportService;
 
+    @Autowired
+    ITaBettingPlanService iTaBettingPlanService;
+
+    @Autowired
+    ITdSportPassService iTdSportPassService;
+
     @Autowired
     TaMatchMapper taMatchMapper;
 
     @Autowired
     TaMatchOddsMapper taMatchOddsMapper;
 
+    @Autowired
+    TaCustomerBettingMapper taCustomerBettingMapper;
+
     @Override
     public List<TaMatch> getMixedMatch(String lottery) throws Exception {
         List<TaMatch> taMatches = taMatchMapper.getMixedMatch(lottery, SportStatusEnum.SALE.getCode());
@@ -90,6 +103,19 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
         return taMatchMapper.getLastResult();
     }
 
+    @Override
+    public IPage<TaMatch> getResult(IPage<TaMatch> page, String lotteryId) throws Exception {
+        IPage<TaMatch> result = taMatchMapper.getResult(page, lotteryId);
+
+        if (null != result.getRecords() && result.getRecords().size() > 0) {
+            for (TaMatch taMatch : result.getRecords()) {
+
+            }
+        }
+
+        return null;
+    }
+
     /**
      * 体彩是否中奖
      * @throws Exception
@@ -104,19 +130,7 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
             try {
                 taMatch.setOpeningStatus(SportOpeningStatusEnum.DOING.getCode());
                 updateById(taMatch);
-
-                String lotteryId = taMatch.getLotteryId();
-                switch (lotteryId) {
-                    case "football":
-                        setFootballPrize(taMatch);
-                        break;
-                    case "basketball":
-                        setBasketballPrize(taMatch);
-                        break;
-                    default:
-                        break;
-                }
-
+                validateMatch(taMatch);
             } catch (Exception e) {
                 // TODO 比如错误日志记录
                 taMatch.setOpeningStatus(SportOpeningStatusEnum.READY.getCode());
@@ -126,12 +140,12 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
     }
 
     /**
-     * 足球开奖
+     * 校验比赛
      * @param taMatch
      * @throws Exception
      */
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
-    private void setFootballPrize(TaMatch taMatch) throws Exception {
+    private void validateMatch (TaMatch taMatch) throws Exception {
         // 获取当前比赛的投注列表
         List<TaCustomerBettingItem> bettingItemList = iTaCustomerBettingItemService.getByMatch(taMatch);
         if (null == bettingItemList || bettingItemList.size() == 0) {
@@ -165,6 +179,12 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
         }
     }
 
+    /**
+     * 校验投注
+     * @param betting
+     * @param item
+     * @throws Exception
+     */
     private void checkAndSetBetting(TaCustomerBetting betting, TaCustomerBettingItem item) throws Exception {
         List<TaCustomerBettingItem> itemList = iTaCustomerBettingItemService.getByBetting(betting);
         if (null == itemList || itemList.size() == 0) {
@@ -172,12 +192,23 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
         }
 
         boolean done = true;
-        for (TaCustomerBettingItem bettingItem : itemList) {
+        boolean existWinningRec = false;
+        for (int i = 0; i < itemList.size(); i++) {
+            TaCustomerBettingItem bettingItem = itemList.get(0);
             if (bettingItem.getItemNo().equals(item.getItemNo())) {
-                bettingItem = item;
+                itemList.set(i, item);
+
+                if (item.getIsWinning()) {
+                    existWinningRec = true;
+                }
+
                 continue;
             }
 
+            if (bettingItem.getIsWinning()) {
+                existWinningRec = true;
+            }
+
             // 如果还有未处理完成的, 跳出循环
             if (!SportOpeningStatusEnum.FINISHED.getCode().equals(bettingItem.getOpeningStatus())) {
                 done = false;
@@ -190,6 +221,27 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
             return;
         }
 
+        // 所有奖都开了
+        betting.setIsOpen(true);
+        betting.setOpeningDate(DateUtils.today());
+        UpdateWrapper<TaCustomerBetting> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("is_open", betting.getIsOpen());
+        updateWrapper.set("opening_date", betting.getOpeningDate());
+        updateWrapper.eq("betting_id", betting.getBettingId());
+        taCustomerBettingMapper.update(betting, updateWrapper);
+
+        // 如果一场都没中, 直接 pass
+        if (!existWinningRec) {
+            return;
+        }
+
+        // 投注方案
+        TaBettingPlan bettingPlan = iTaBettingPlanService.getById(betting.getPlanId());
+        if (null == bettingPlan) {
+            throw new Exception("校验投注方案失败");
+        }
+        betting.setBettingPlan(bettingPlan);
+
         // 结算最终奖金
         computePirzeAmount(betting, itemList);
     }
@@ -223,26 +275,77 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
             }
 
             // 只有中奖的投注才会参与计算
-            // 所以会出现 size = 0 情况
             List<String> oddsOfNote = new ArrayList<>();
             for (TaCustomerBettingSport sportItem : sportList) {
                 if (sportItem.getIsWinning()) {
                     oddsOfNote.add(sportItem.getOddsPrinted());
+                } else {
+                    // 未中奖的赔率是 0
+                    oddsOfNote.add("0");
                 }
             }
 
             noteList.add(oddsOfNote);
         }
-    }
 
-    /**
-     * 篮球开奖
-     * @param taMatch
-     * @throws Exception
-     */
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
-    private void setBasketballPrize(TaMatch taMatch) throws Exception {
+        // 玩法字典
+        if (null == betting.getBettingPlan().getPassCode()) {
+            throw new Exception("校验过关模式失败");
+        }
+        TdSportPass tdSportPass = iTdSportPassService.getById(betting.getBettingPlan().getPassCode());
+        if (null == tdSportPass) {
+            throw new Exception("校验过关模式失败");
+        }
+
+        List<List<List<String>>> mockCombList = BizUtils.mockAllCombination(noteList, tdSportPass);
+
+        // 计算方法:  https://www.lottery.gov.cn/bzzx/yxgz/20191119/1273604.html
+        float totalCharge = 0.0f;
+        for (List<List<String>> notes : mockCombList) {
+
+            // 多种可能的结果会直接相加
+            float perCombCharge = 0.0f;
+            for (List<String> oddsList : notes) {
+
+                // 比如购买的 3串4
+                // 3串4的金额是 2串1 + 2串1 + 2串1 + 3串1
+                float perNoteCharge = 0.0f;
+                for (String oddsStr : oddsList) {
+
+                    // 比如2串1
+                    // 2串1的金额是  第一场比赛赔率*第二次比赛赔率
+                    // 依次类推, 如果是 3串1 则是3场相乘
+                    float odds = Float.parseFloat(oddsStr);
+
+                    // 此处判断是否第一次循环, float 不能用 == 判断
+                    if (perNoteCharge < 0.01f) {
+                        perNoteCharge = odds;
+                    } else {
+                        perNoteCharge += odds;
+                    }
+                }
+
+                perCombCharge += perNoteCharge;
+            }
+
+            // 金额 = 2块(200分) * 赔率 * 投注倍数
+            totalCharge += 200 * perCombCharge * betting.getBettingTimes();
+        }
+
+        // 如果没有中奖
+        if (totalCharge < 0.01f) {
+            return;
+        }
+
+        betting.setIsWinning(true);
+        betting.setWinAmount((int) totalCharge);
+        UpdateWrapper<TaCustomerBetting> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("is_winning", betting.getIsWinning());
+        updateWrapper.set("win_amount", betting.getWinAmount());
+        updateWrapper.eq("betting_id", betting.getBettingId());
+        taCustomerBettingMapper.update(betting, updateWrapper);
 
+        // TODO 发送通知
     }
 
     private boolean isWining(TaMatch taMatch, TaCustomerBettingSport bettingSport) {

src/main/java/com/yunzhi/niucai/vo/CustIdentityInfo.java

@@ -0,0 +1,17 @@
+package com.yunzhi.niucai.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "登录参数")
+@Data
+public class CustIdentityInfo {
+
+    @ApiModelProperty("真实姓名")
+    String realName;
+
+    @ApiModelProperty("身份证号码")
+    String idCard;
+}

src/main/resources/mapper/TaMatchMapper.xml

@@ -40,4 +40,14 @@
         ORDER BY
             t.match_id ASC
     </select>
+    <select id="getResult" resultType="com.yunzhi.niucai.entity.TaMatch">
+        SELECT
+            *
+        FROM
+            ta_match t
+        WHERE
+            t.`status` &gt; 1
+        ORDER BY
+            t.match_id DESC
+    </select>
 </mapper>