feats

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

@@ -69,7 +69,7 @@ public class TaMatchController extends BaseController {
     @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 {
+                                  @ApiParam("彩种类型: 可用类型, 请查阅彩种字典") @RequestParam(value ="lotteryId") String lotteryId) throws Exception {
 
         IPage<TaMatch> page = new Page<>(pageNum, pageSize);
         IPage<TaMatch> result = iTaMatchService.getResult(page, lotteryId);

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

@@ -113,13 +113,13 @@ public class TaMatch implements Serializable {
      * 让分
      */
     @ApiModelProperty("让分")
-    private Integer spreadPoints;
+    private String spreadPoints;
 
     /**
      * 预设分
      */
     @ApiModelProperty("篮球:预设分")
-    private Integer presetPoints;
+    private String presetPoints;
 
     /**
      * 创建时间

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

@@ -119,7 +119,7 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
             }
         }
 
-        return null;
+        return result;
     }
 
     /**

src/main/resources/mapper/TaMatchMapper.xml

@@ -46,7 +46,8 @@
         FROM
             ta_match t
         WHERE
-            t.`status` > 1
+            t.lottery_id = #{lotteryId}
+            AND t.`status` > 1
         ORDER BY
             t.match_id DESC
     </select>

src/main/resources/mapper/TaMatchOddsMapper.xml

@@ -7,7 +7,8 @@
             s.way_code AS wayCode,
             s.rule_code AS ruleCode,
             s.`name`,
-            t.odds
+            t.odds,
+            t.is_winning as isWinning
         FROM ( SELECT *
                 FROM ( SELECT * FROM ta_match_odds a
                         WHERE a.match_id = #{matchId}