feats

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

@@ -0,0 +1,89 @@
+package com.yunzhi.niucai.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 业务相关工具类
+ */
+public class BizUtils {
+    /**
+     * 计算竞彩过关总数
+     * 计算方式如下, 比如购买 5 场  4串5
+     * 那么从第一场开始与剩下的4场进行组合，求可能的组合数
+     * 接着第二场与剩下的3场进行组合，求可能的组合数
+     * 依次下去，直到剩余的场次不能组合4串1
+     * 示例 5场的投注注数为 [1, 2, 3, 4, 2]
+     * 第一场则有 4种组合可能，即 剩余的 4场挑 3场与第一场组合, C3-4 就是 4
+     *     [1, 2, 3, 4] = 1 * 2 * 3 * 4 = 24
+     *     [1, 2, 3, 2] = 1 * 2 * 3 * 2 = 12
+     *     [1, 2, 4, 2] = 1 * 2 * 4 * 2 = 16
+     *     [1, 3, 4, 2] = 1 * 3 * 4 * 2 = 24
+     *   第一场结果就是 24 + 12 + 16 + 24 = 76
+     * 第二场有 1 种可能, 即 只能把剩余的 3场全部拿来组合
+     *     [2, 3, 4, 2] = 2 * 3 * 4 * 2 = 48
+     * 剩余的都不能再组合 4串1
+     * 因此总过关数是  (76 + 48) * 5  这个 5 来源 4串5
+     * @param unitNum
+     * @param amount
+     * @param noteNumList
+     * @return
+     */
+    public static int computeSportNoteNum(int unitNum, int amount, List<Integer> noteNumList) {
+        if (null == noteNumList || noteNumList.size() == 0) {
+            return 0;
+        }
+
+        List<List<Integer>> result = new ArrayList<>();
+        int times = 0;
+        int cursor = 0;
+
+        // 比如 5 场 投注 4串5, 只可能循环2次, 因为后面的都不能组合为 4串1
+        int max = noteNumList.size() - (unitNum - times);
+
+        // 遍历每场的可能
+        for(int i = cursor; i <= max; i++) {
+            List<Integer> last = new ArrayList<>();
+            last.add(noteNumList.get(i));
+            recursion(noteNumList, unitNum, times, cursor, last, result);
+        }
+
+        // 遍历结果, 外循环是场次的结果，需要相加
+        // 内循环是每场的组合可能, 需要相乘
+        int sum = 0;
+        for(List<Integer> noteNum: result) {
+            int multi = 1;
+            for(Integer n: noteNum) {
+                multi *= n;
+            }
+            sum += multi;
+        }
+
+        return sum * amount;
+    }
+
+    /**
+     * 递归遍历每种排列组合方式
+     * @param noteNumList
+     * @param unitNum 过关场数 比如 4串1 , 4 就是场数
+     * @param times 当前场数 0 开始
+     * @param cursor noteNumList 的 当前位置
+     * @param last  上一轮结果
+     * @param out 通过 ref 方式输出结果
+     */
+    private static void recursion(List<Integer> noteNumList, int unitNum, int times, int cursor, List<Integer> last, List<List<Integer>> out) {
+        int max = noteNumList.size() - (unitNum - times);
+
+        for (int i = cursor; i <= max; i ++) {
+            List<Integer> current = last;
+            current.add(noteNumList.get(i));
+
+            if (times == unitNum - 1) {
+                out.add(current);
+            } else {
+                // 每一轮只能取后面的一个位置数据
+                recursion(noteNumList, unitNum, times + 1, i + 1, current, out);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.yunzhi.niucai.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.niucai.service.ITaCustomerBettingService;
+import com.yunzhi.niucai.entity.TaCustomerBetting;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 客户投注  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-09-09
+ */
+
+@Api(tags = "客户投注 ")
+@RestController
+@RequestMapping("/")
+public class TaCustomerBettingController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerBettingController.class);
+
+    @Autowired
+    public ITaCustomerBettingService iTaCustomerBettingService;
+
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taCustomerBetting",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taCustomerBettingList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaCustomerBetting> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaCustomerBetting> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaCustomerBetting> result = iTaCustomerBettingService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param taCustomerBetting 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taCustomerBetting",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taCustomerBettingAdd(@ApiParam("保存内容") @RequestBody TaCustomerBetting taCustomerBetting) throws Exception{
+//
+//        if (iTaCustomerBettingService.save(taCustomerBetting)){
+//            return ResponseBean.success(taCustomerBetting);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taCustomerBetting/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taCustomerBettingDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaCustomerBettingService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taCustomerBetting 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taCustomerBetting/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taCustomerBettingUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaCustomerBetting taCustomerBetting) throws Exception{
+//
+//        if (iTaCustomerBettingService.updateById(taCustomerBetting)){
+//            return ResponseBean.success(iTaCustomerBettingService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taCustomerBetting/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taCustomerBettingGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaCustomerBettingService.getById(id));
+//    }
+}

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

@@ -70,9 +70,25 @@ public class TaBettingPlan implements Serializable {
     private Integer status;
 
 
-    @ApiModelProperty("总金额: 单位分")
+    @ApiModelProperty("总注数")
     @TableField(exist = false)
-    private Integer totalCharges;
+    private Integer notesNum;
+
+    @ApiModelProperty("投注金额: 单位分")
+    @TableField(exist = false)
+    private Integer totalPrice;
+
+    @ApiModelProperty("投注店铺")
+    @TableField(exist = false)
+    private Integer shopId;
+
+    @ApiModelProperty("投注店铺名称")
+    @TableField(exist = false)
+    private String shopName;
+
+    @ApiModelProperty("购彩期数")
+    @TableField(exist = false)
+    private String issueNo;
 
     @ApiModelProperty("方案明细")
     @TableField(exist = false)

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

@@ -52,13 +52,13 @@ public class TaBettingPlanItem implements Serializable {
     private String matchDate;
 
     @ApiModelProperty(value = "主队")
-    private String homeTeamId;
+    private Integer homeTeamId;
 
     @ApiModelProperty(value = "主队名称")
     private String homeTeamName;
 
     @ApiModelProperty(value = "客队")
-    private String awayTeamId;
+    private Integer awayTeamId;
 
     @ApiModelProperty(value = "客队名称")
     private String awayTeamName;
@@ -97,7 +97,7 @@ public class TaBettingPlanItem implements Serializable {
     @TableField(exist = false)
     private Integer charges;
 
-    @ApiModelProperty("赔率明细")
+    @ApiModelProperty("体彩明细")
     @TableField(exist = false)
-    private List<TaBettingPlanItemDetail> detailList;
+    private List<TaBettingPlanSportDetail> detailList;
 }

src/main/java/com/yunzhi/niucai/entity/TaBettingPlanItemDetail.java → src/main/java/com/yunzhi/niucai/entity/TaBettingPlanSportDetail.java

@@ -12,17 +12,17 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 方案条目详情
+ * 体彩方案玩法明细 
  * </p>
  *
  * @author yansen
- * @since 2020-09-08
+ * @since 2020-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="TaBettingPlanItemDetail对象", description="方案条目详情")
-public class TaBettingPlanItemDetail implements Serializable {
+@ApiModel(value="TaBettingPlanSportDetail对象", description="体彩方案玩法明细 ")
+public class TaBettingPlanSportDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -30,38 +30,32 @@ public class TaBettingPlanItemDetail implements Serializable {
     @TableId(value = "serial_no", type = IdType.AUTO)
     private Integer serialNo;
 
-    @ApiModelProperty(value = "条目")
-    private String itemNo;
-
-    @ApiModelProperty(value = "方案ID")
-    private String planId;
+    @ApiModelProperty(value = "条目编号")
+    private Integer itemNo;
 
     @ApiModelProperty(value = "比赛ID")
-    private String matchId;
-
-    @ApiModelProperty(value = "场次")
-    private String matchWeek;
-
-    @ApiModelProperty(value = "主队")
-    private String homeTeamName;
+    private Integer matchId;
 
-    @ApiModelProperty(value = "客队")
-    private String awayTeamName;
-
-    @ApiModelProperty(value = "玩法")
+    @ApiModelProperty(value = "玩法编码")
     private String wayCode;
 
-    @ApiModelProperty(value = "结果")
-    private String result;
+    @ApiModelProperty(value = "玩法名称")
+    private String wayName;
 
     @ApiModelProperty(value = "赔率")
-    private Integer odds;
+    private String odds;
+
+    @ApiModelProperty(value = "赛制编码")
+    private String ruleCode;
+
+    @ApiModelProperty(value = "赛制名称")
+    private String ruleName;
 
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
     @ApiModelProperty(value = "状态")
-    private Integer status;
+    private Boolean status;
 
 
 }

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

@@ -0,0 +1,100 @@
+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-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaCustomerBetting对象", description="客户投注 ")
+public class TaCustomerBetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "投注ID")
+    @TableId(value = "betting_id", type = IdType.AUTO)
+    private Integer bettingId;
+
+    @ApiModelProperty(value = "投注人")
+    private Integer customerId;
+
+    @ApiModelProperty(value = "投注人姓名")
+    private String customerName;
+
+    @ApiModelProperty(value = "投注店铺")
+    private Integer shopId;
+
+    @ApiModelProperty(value = "店铺名称")
+    private String shopName;
+
+    @ApiModelProperty(value = "投注方案")
+    private Integer planId;
+
+    @ApiModelProperty(value = "方案简称")
+    private String planName;
+
+    @ApiModelProperty(value = "投注彩种")
+    private String lotteryId;
+
+    @ApiModelProperty(value = "彩种名称")
+    private String lotteryName;
+
+    @ApiModelProperty(value = "投注期数")
+    private String issueNo;
+
+    @ApiModelProperty(value = "投注倍数")
+    private Integer bettingTimes;
+
+    @ApiModelProperty(value = "是否追加")
+    private Boolean isAdd;
+
+    @ApiModelProperty(value = "总注数")
+    private Integer notesNum;
+
+    @ApiModelProperty(value = "投注金额 单位分")
+    private Integer totalPrice;
+
+    @ApiModelProperty(value = "预期收益")
+    private String expectedEarning;
+
+    @ApiModelProperty(value = "是否打单")
+    private Boolean isPrinted;
+
+    @ApiModelProperty(value = "彩票图片")
+    private String lotteryPicture;
+
+    @ApiModelProperty(value = "是否开奖")
+    private Boolean isOpen;
+
+    @ApiModelProperty(value = "是否中奖")
+    private Boolean isWinning;
+
+    @ApiModelProperty(value = "中奖等级")
+    private String winLevel;
+
+    @ApiModelProperty(value = "中奖金额 单位分")
+    private Integer winAmount;
+
+    @ApiModelProperty(value = "投注时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "状态")
+    private Boolean status;
+
+
+}

src/main/java/com/yunzhi/niucai/entity/TaCustomerBettingSport.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-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaCustomerBettingSport对象", description="客户投注竞彩明细 ")
+public class TaCustomerBettingSport 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 bettingId;
+
+    @ApiModelProperty(value = "方案条目")
+    private Integer itemNo;
+
+    @ApiModelProperty(value = "方案明细ID")
+    private Integer detailNo;
+
+    @ApiModelProperty(value = "比赛ID")
+    private Integer matchId;
+
+    @ApiModelProperty(value = "赛制编码")
+    private String ruleCode;
+
+    @ApiModelProperty(value = "下单赔率")
+    private String oddsOrdered;
+
+    @ApiModelProperty(value = "打单赔率")
+    private String oddsPrinted;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "状态")
+    private Boolean status;
+
+
+}

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

@@ -74,6 +74,16 @@ public class TdLottery implements Serializable {
      */
     private Boolean isRepeat;
 
+    /**
+     * 前区数字个数
+     */
+    private Integer firstNums;
+
+    /**
+     * 后区数字个数
+     */
+    private Integer secondNums;
+
     /**
      * 是否地方彩
      */

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

@@ -48,7 +48,7 @@ public class TdSportPass implements Serializable {
      * 关数
      */
     @ApiModelProperty("关数")
-    private String amount;
+    private Integer amount;
 
     /**
      * 单场

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

@@ -1,18 +0,0 @@
-package com.yunzhi.niucai.mapper;
-
-import com.yunzhi.niucai.entity.TaBettingPlanItemDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 方案条目详情 Mapper 接口
- * </p>
- *
- * @author yansen
- * @since 2020-09-08
- */
-@Mapper
-public interface TaBettingPlanItemDetailMapper extends BaseMapper<TaBettingPlanItemDetail> {
-
-}

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

@@ -0,0 +1,18 @@
+package com.yunzhi.niucai.mapper;
+
+import com.yunzhi.niucai.entity.TaBettingPlanSportDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 体彩方案玩法明细  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-09
+ */
+@Mapper
+public interface TaBettingPlanSportDetailMapper extends BaseMapper<TaBettingPlanSportDetail> {
+
+}

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

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

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

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

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

@@ -1,16 +0,0 @@
-package com.yunzhi.niucai.service;
-
-import com.yunzhi.niucai.entity.TaBettingPlanItemDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 方案条目详情 服务类
- * </p>
- *
- * @author yansen
- * @since 2020-09-08
- */
-public interface ITaBettingPlanItemDetailService extends IService<TaBettingPlanItemDetail> {
-
-}

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

@@ -0,0 +1,16 @@
+package com.yunzhi.niucai.service;
+
+import com.yunzhi.niucai.entity.TaBettingPlanSportDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 体彩方案玩法明细  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-09
+ */
+public interface ITaBettingPlanSportDetailService extends IService<TaBettingPlanSportDetail> {
+
+}

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

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

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

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

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

@@ -3,6 +3,8 @@ package com.yunzhi.niucai.service;
 import com.yunzhi.niucai.entity.TaMatchOdds;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  * 赔率 服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMatchOddsService extends IService<TaMatchOdds> {
 
+    TaMatchOdds getByMatchAndRule(String lotteryId, Integer matchId, String ruleCode) throws Exception;
+
+    Map<String, TaMatchOdds> getGroupedByRule(Integer matchId) throws Exception;
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.niucai.service;
 import com.yunzhi.niucai.entity.TaMatchWay;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  * 比赛玩法  服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMatchWayService extends IService<TaMatchWay> {
 
+    TaMatchWay getByMatchAndWay(String lotteryId, Integer matchId, String wayCode) throws Exception;
+
+    Map<String, TaMatchWay> getGroupedByWay(Integer matchId) throws Exception;
 }

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

@@ -1,20 +0,0 @@
-package com.yunzhi.niucai.service.impl;
-
-import com.yunzhi.niucai.entity.TaBettingPlanItemDetail;
-import com.yunzhi.niucai.mapper.TaBettingPlanItemDetailMapper;
-import com.yunzhi.niucai.service.ITaBettingPlanItemDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 方案条目详情 服务实现类
- * </p>
- *
- * @author yansen
- * @since 2020-09-08
- */
-@Service
-public class TaBettingPlanItemDetailServiceImpl extends ServiceImpl<TaBettingPlanItemDetailMapper, TaBettingPlanItemDetail> implements ITaBettingPlanItemDetailService {
-
-}

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

@@ -1,19 +1,19 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.yunzhi.niucai.common.BizUtils;
 import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.entity.*;
 import com.yunzhi.niucai.enums.SportStatusEnum;
 import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TaBettingPlanMapper;
-import com.yunzhi.niucai.service.ITaBettingPlanService;
+import com.yunzhi.niucai.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yunzhi.niucai.service.ITaMatchService;
-import com.yunzhi.niucai.service.ITdLotteryService;
-import com.yunzhi.niucai.service.ITdSportPassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -36,10 +36,49 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
     ITaMatchService iTaMatchService;
 
     @Autowired
-    ITdSportPassService iTdSportPassService;
+    ITaMatchWayService iTaMatchWayService;
+
+    @Autowired
+    ITaMatchOddsService iTaMatchOddsService;
+
+    @Autowired
+    ITaShopService iTaShopService;
 
     @Override
     public boolean betting(TaBettingPlan taBettingPlan, TaCustomer customer) throws Exception {
+        //
+        validateBetting(taBettingPlan);
+
+        taBettingPlan.setCustomerId(customer.getCustomerId());
+        taBettingPlan.setStatus(StatusEnum.READY.getCode());
+
+        // 入库
+
+        // 我的
+
+        // 下单
+        return true;
+    }
+
+    private void validateShop(TaBettingPlan taBettingPlan) throws Exception {
+        if (null == taBettingPlan.getShopId()) {
+            throw new Exception("请选择投注店铺");
+        }
+
+        TaShop taShop = iTaShopService.getById(taBettingPlan.getShopId());
+        if (null == taShop) {
+            throw new Exception("投注店铺不存在");
+        }
+
+        // 店铺状态不对
+        if (!StatusEnum.NORMAL.getCode().equals(taShop.getStatus())) {
+            throw new Exception("投注店铺状态异常, 请更换");
+        }
+
+        taBettingPlan.setShopName(taShop.getName());
+    }
+
+    private void validateBetting(TaBettingPlan taBettingPlan) throws Exception {
         if (null == taBettingPlan.getLotteryId()) {
             throw new Exception("投注彩种不能未空");
         }
@@ -48,44 +87,93 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
         if (null == tdLottery) {
             throw new Exception("投注彩种不合法");
         }
-
+        taBettingPlan.setLotteryName(tdLottery.getName());
+        taBettingPlan.setIsDigit(tdLottery.getIsSport());
+        taBettingPlan.setIsDigit(tdLottery.getIsDigit());
 
         // 校验彩种
         validateLottery(taBettingPlan, tdLottery);
 
+        //
+        validateShop(taBettingPlan);
 
         // 校验明细
-        Integer totalCharges = 0
         if (null == taBettingPlan.getItemList()) {
             throw new Exception("请设置投注内容");
         }
-        for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
-            if (null == item.getCharges() || 0 == item.getCharges()) {
-                throw new Exception("投注内容金额不能为空或者零")
+
+        // 如果是体彩
+        if (tdLottery.getIsSport()) {
+            if (StringUtils.isEmpty(taBettingPlan.getPassCode())) {
+                throw new Exception("过关方式不能为空");
             }
 
-            totalCharges += item.getCharges();
+            TdSportPass tdSportPass = iTdSportPassService.getById(taBettingPlan.getPassCode());
+            if (null == tdSportPass) {
+                throw new Exception("过关方式不合法");
+            }
+            taBettingPlan.setPassName(tdSportPass.getName());
+
+            List<TaBettingPlanItem> itemList = taBettingPlan.getItemList();
+            if (null == itemList || tdSportPass.getUnitNum() > itemList.size()) {
+                throw new Exception("投注比赛场次数量不正确");
+            }
 
-            // 依据彩种做不同校验
-            if (taBettingPlan.getIsSport()) {
+            List<Integer> noteNumList = new ArrayList<>();
+            for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
                 validateSport(taBettingPlan, item, tdLottery);
+                noteNumList.add(item.getDetailList().size());
             }
-            if (taBettingPlan.getIsDigit()) {
-                validateDigit(taBettingPlan, item, tdLottery);
+
+            // 校验注数
+            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();
+            if (null == taBettingPlan.getTotalPrice() || !taBettingPlan.getTotalPrice().equals(totalPrice)) {
+                throw new Exception("投注总金额计算不正确");
+            }
 
-        // 校验投注额
-        if (null == taBettingPlan.getTotalCharges() || 0 == taBettingPlan.getTotalCharges()) {
-            taBettingPlan.setTotalCharges(totalCharges);
-        } else if (totalCharges != taBettingPlan.getTotalCharges()) {
-            throw new Exception("投注内容总额计算不正确");
+            if (totalPrice > tdLottery.getMaxPrice()) {
+                throw new Exception("投注总金额不能超过 " + String.format("%.2f", tdLottery.getMaxPrice() / 100 ) + "元");
+            }
         }
 
-        validateLotteryCharges(taBettingPlan, tdLottery);
+        // 如果是数字彩
+        if (tdLottery.getIsDigit()) {
+            Integer totalCharges = 0;
+            Integer totalNoteNum = 0;
+            for (TaBettingPlanItem item : taBettingPlan.getItemList()) {
+                validateDigit(taBettingPlan, item, tdLottery);
+                totalCharges += item.getCharges();
+                totalNoteNum += item.getAmount();
+            }
+
+            if (null == taBettingPlan.getTotalPrice()) {
+                taBettingPlan.setTotalPrice(totalCharges);
+            }
+            if (null == taBettingPlan.getNotesNum()) {
+                taBettingPlan.setNotesNum(totalNoteNum);
+            }
+
+            if (!taBettingPlan.getTotalPrice().equals(totalCharges)) {
+                throw new Exception("投注总金额计算不正确");
+            }
+
+            // 不能超过限额
+            Integer maxPrice = tdLottery.getMaxPrice();
+            if (tdLottery.getIsAdd()) {
+                maxPrice = tdLottery.getMaxAddPrice();
+            }
+            if (maxPrice < totalCharges) {
+                throw new Exception("投注总金额不能超过 " + String.format("%.2f", maxPrice / 100 ) + "元");
+            }
+        }
 
-        return false;
+        return;
     }
 
     private void validateLottery(TaBettingPlan taBettingPlan, TdLottery tdLottery) throws Exception {
@@ -97,46 +185,10 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
             throw new Exception("当前投注倍数太大(小), 不能超过" + tdLottery.getMaxTimes());
         }
 
-        // todo 校验停售时间
-
-        // 如果是体彩, 校验过关方式
-        if (null != tdLottery.getIsSport() && tdLottery.getIsSport()) {
-            if (StringUtils.isEmpty(taBettingPlan.getPassCode())) {
-                throw new Exception("过关方式不能为空");
-            }
-
-            TdSportPass tdSportPass = iTdSportPassService.getById(taBettingPlan.getPassCode());
-            if (null == tdSportPass) {
-                throw new Exception("过关方式不合法");
-            }
-
-            List<TaBettingPlanItem> itemList = taBettingPlan.getItemList();
-            if (null == itemList || tdSportPass.getUnitNum() > itemList.size()) {
-                throw new Exception("投注比赛场次数量不正确");
-            }
-
-            taBettingPlan.setPassName(tdSportPass.getName());
-        }
-
-        // 如果一切正常
-        taBettingPlan.setLotteryName(tdLottery.getName());
-        taBettingPlan.setIsSport(tdLottery.getIsSport());
-    }
-
-    private void validateLotteryCharges(TaBettingPlan taBettingPlan, TdLottery tdLottery) throws Exception {
+        // todo 投注期数
 
-        if (null == taBettingPlan.getTotalCharges()) {
-            throw new Exception("请先计算投注总额");
-        }
+        // todo 校验停售时间
 
-        // 如果是追加
-        Integer maxPrice = tdLottery.getMaxPrice()
-        if (tdLottery.getIsAdd()) {
-            maxPrice = tdLottery.getMaxAddPrice();
-        }
-        if (maxPrice < taBettingPlan.getTotalCharges()) {
-            throw new Exception("当前投注额太大, 不能超过" + String.format("%.2f", maxPrice / 100) + "元");
-        }
     }
 
     private void validateSport(TaBettingPlan taBettingPlan,
@@ -145,21 +197,88 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
         // 获取比赛信息
         TaMatch taMatch = iTaMatchService.getById(taBettingPlanItem.getMatchId());
         if (null == taMatch) {
-            throw new Exception("设置比赛不存在");
+            throw new Exception("未投注比赛或者比赛不存在");
         }
+        taBettingPlanItem.setLeagueId(taMatch.getLeagueId());
+        taBettingPlanItem.setLeagueName(taMatch.getLeagueName());
+        taBettingPlanItem.setMatchWeek(taMatch.getMatchWeek());
+        taBettingPlanItem.setMatchDate(taMatch.getMatchDate());
+        taBettingPlanItem.setHomeTeamId(taMatch.getHomeTeamId());
+        taBettingPlanItem.setHomeTeamName(taMatch.getHomeTeamName());
+        taBettingPlanItem.setAwayTeamId(taMatch.getAwayTeamId());
+        taBettingPlanItem.setAwayTeamName(taMatch.getAwayTeamName());
 
         // 如果当前比赛不是在售
         if (!SportStatusEnum.SALE.getCode().equals(taMatch.getStatus())) {
+            throw new Exception("投注比赛非在售状态");
+        }
+
+        // 投注内容
+        if (null == taBettingPlanItem.getDetailList() || taBettingPlanItem.getDetailList().size() == 0) {
+            throw new Exception("未找到比赛的投注内容");
+        }
+
+        // 当前比赛玩法
+        Map<String, TaMatchWay> taMatchWayMap = iTaMatchWayService.getGroupedByWay(taMatch.getMatchId());
+        if (null == taMatchWayMap) {
+            throw new Exception("未找到投注比赛玩法设置");
+        }
+
+//        // 当前比赛赔率
+//        Map<String, TaMatchOdds> taMatchOddsMap = iTaMatchOddsService.getGroupedByRule(taMatch.getMatchId());
+//        if (null == taMatchOddsMap) {
+//            throw new Exception("未找到投注比赛赔率设置");
+//        }
+
+        // 单关-过关验证
+        boolean isSinglePass = iTdSportPassService.getSinglePassCode().equals(taBettingPlan.getPassCode());
+
+        // 玩法等验证
+        for (TaBettingPlanSportDetail detail: taBettingPlanItem.getDetailList()) {
+            detail.setMatchId(taMatch.getMatchId());
 
+            if (StringUtils.isEmpty(detail.getOdds())) {
+                throw new Exception("未找到投注比赛明细赔率设置");
+            }
+
+            TaMatchWay taMatchWay = taMatchWayMap.get(detail.getWayCode());
+            if (null == taMatchWay) {
+                throw new Exception("未找到投注比赛明细玩法设置");
+            }
+
+            if (null == taMatchWay.getIsOn() || !taMatchWay.getIsOn()) {
+                throw new Exception("投注比赛明细未开启购彩玩法");
+            }
+
+            if (isSinglePass) {
+                if (null == taMatchWay.getIsSingle() || !taMatchWay.getIsSingle()) {
+                    throw new Exception("投注比赛明细未开启单关玩法");
+                }
+            } else {
+                if (null == taMatchWay.getIsPass() || !taMatchWay.getIsPass()) {
+                    throw new Exception("投注比赛明细未开启过关玩法");
+                }
+            }
         }
 
-        // 是否单关
-        boolean isSinglePass = iTdSportPassService.getSinglePassCode().equals(taBettingPlan.passCode());
     }
 
     private void validateDigit(TaBettingPlan taBettingPlan,
                                TaBettingPlanItem taBettingPlanItem,
                                TdLottery tdLottery) throws Exception {
+        if (null == taBettingPlanItem.getAmount() || 0 == taBettingPlanItem.getAmount()) {
+            throw new Exception("投注注数不能为空");
+        }
+
+        Integer charges = taBettingPlanItem.getAmount() * tdLottery.getUnitPrice();
+        if (null == taBettingPlanItem.getCharges() || 0 == taBettingPlanItem.getCharges()) {
+            taBettingPlanItem.setCharges(charges);
+        }
+
+        if (!charges.equals(taBettingPlanItem.getCharges())) {
+            throw new Exception("投注金额不正确");
+        }
 
+        return;
     }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.niucai.service.impl;
+
+import com.yunzhi.niucai.entity.TaBettingPlanSportDetail;
+import com.yunzhi.niucai.mapper.TaBettingPlanSportDetailMapper;
+import com.yunzhi.niucai.service.ITaBettingPlanSportDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 体彩方案玩法明细  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-09
+ */
+@Service
+public class TaBettingPlanSportDetailServiceImpl extends ServiceImpl<TaBettingPlanSportDetailMapper, TaBettingPlanSportDetail> implements ITaBettingPlanSportDetailService {
+
+}

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

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

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

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

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

@@ -1,11 +1,16 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.entity.TaMatchOdds;
 import com.yunzhi.niucai.mapper.TaMatchOddsMapper;
 import com.yunzhi.niucai.service.ITaMatchOddsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 赔率 服务实现类
@@ -17,4 +22,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMatchOddsServiceImpl extends ServiceImpl<TaMatchOddsMapper, TaMatchOdds> implements ITaMatchOddsService {
 
+    @Override
+    public TaMatchOdds getByMatchAndRule(String lotteryId, Integer matchId, String ruleCode) throws Exception {
+        QueryWrapper<TaMatchOdds> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("lottery_id", lotteryId);
+        queryWrapper.eq("match_id", matchId);
+        queryWrapper.eq("rule_code", ruleCode);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public Map<String, TaMatchOdds> getGroupedByRule(Integer matchId) throws Exception {
+        QueryWrapper<TaMatchOdds> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("match_id", matchId);
+
+        List<TaMatchOdds> list = list(queryWrapper);
+        if (null == list || list.size() == 0) {
+            return null;
+        }
+
+        Map<String, TaMatchOdds> res = new HashMap<>();
+        for (TaMatchOdds taMatchOdds: list) {
+            res.put(taMatchOdds.getRuleCode(), taMatchOdds);
+        }
+        return res;
+    }
 }

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

@@ -1,11 +1,17 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.entity.TaMatchWay;
+import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TaMatchWayMapper;
 import com.yunzhi.niucai.service.ITaMatchWayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 比赛玩法  服务实现类
@@ -17,4 +23,34 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMatchWayServiceImpl extends ServiceImpl<TaMatchWayMapper, TaMatchWay> implements ITaMatchWayService {
 
+    @Override
+    public TaMatchWay getByMatchAndWay(String lotteryId, Integer matchId, String wayCode) throws Exception {
+        QueryWrapper<TaMatchWay> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("lottery_id", lotteryId);
+        queryWrapper.eq("match_id", matchId);
+        queryWrapper.eq("way_code", wayCode);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public Map<String, TaMatchWay> getGroupedByWay(Integer matchId) throws Exception {
+        QueryWrapper<TaMatchWay> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("match_id", matchId);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+//        queryWrapper.orderByAsc("way_code");
+
+        List<TaMatchWay> list = list(queryWrapper);
+        if (null == list || list.size() == 0) {
+            return null;
+        }
+
+        Map<String, TaMatchWay> res = new HashMap<>();
+        for (TaMatchWay taMatchWay: list) {
+            res.put(taMatchWay.getWayCode(), taMatchWay);
+        }
+        return res;
+    }
 }

src/main/resources/mapper/TaBettingPlanSportDetailMapper.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.TaBettingPlanSportDetailMapper">
+
+</mapper>

src/main/resources/mapper/TaBettingPlanItemDetailMapper.xml → src/main/resources/mapper/TaCustomerBettingMapper.xml

@@ -1,5 +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.TaBettingPlanItemDetailMapper">
+<mapper namespace="com.yunzhi.niucai.mapper.TaCustomerBettingMapper">
 
 </mapper>

src/main/resources/mapper/TaCustomerBettingSportMapper.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.TaCustomerBettingSportMapper">
+
+</mapper>