Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/controller/AppGameBettingController.java

@@ -8,6 +8,7 @@ import com.game.business.dto.AppGameBettingDetailsCountDTO;
 import com.game.business.service.*;
 import com.game.common.core.controller.BaseController;
 import com.game.common.core.domain.AjaxResult;
+import com.game.common.core.domain.R;
 import com.game.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -181,13 +182,13 @@ public class AppGameBettingController extends BaseController{
      */
     @GetMapping(value = "/count")
     @ApiOperation(value = "游戏输赢统计（首页）", notes = "游戏输赢统计（首页）")
-    public AjaxResult getCount(@RequestParam(name = "strDate") String strDate)
+    public R<AppGameBettingCountDTO> getCount(@RequestParam(name = "strDate") String strDate)
     {
         AppGameBettingCountDTO appGameBettingCountDTO = new AppGameBettingCountDTO();
         List<AppGame> gameList = appGameService.selectAppGameList(new AppGame());
 
         if(gameList == null || gameList.isEmpty()){
-            return success(appGameBettingCountDTO);
+            return R.ok(appGameBettingCountDTO);
         }
 
         List<AppGameBettingDetailsCountDTO> countList = appGameBettingService.getCount(strDate);
@@ -226,7 +227,7 @@ public class AppGameBettingController extends BaseController{
         appGameBettingCountDTO.setWinAmount(winAmount);
         appGameBettingCountDTO.setLoseAmount(loseAmount);
         appGameBettingCountDTO.setList(newList);
-        return success(appGameBettingCountDTO);
+        return R.ok(appGameBettingCountDTO);
     }
 
     /**
@@ -234,7 +235,7 @@ public class AppGameBettingController extends BaseController{
      */
     @GetMapping(value = "/listByGameId")
     @ApiOperation(value = "游戏输赢统计（详情）", notes = "游戏输赢统计（详情）")
-    public TableDataInfo getListByGameId(@RequestParam(name = "gameId") Long gameId)
+    public TableDataInfo<AppGameBetting> getListByGameId(@RequestParam(name = "gameId") Long gameId)
     {
         startPage();
         List<AppGameBetting> list = appGameBettingService.selectListByGameId(gameId);

game-business/src/main/java/com/game/business/domain/AppGameBetting.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.game.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@ import java.util.Date;
 
 @Data
 @TableName(value = "app_game_betting")
+@ApiModel(value = "app_game_betting", description = "游戏投注记录")
 public class AppGameBetting {
 
     @ApiModelProperty(value = "游戏投注Id")

game-business/src/main/java/com/game/business/dto/AppGameBettingCountDTO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-@ApiModel(description = "游戏输赢汇总")
+@ApiModel(value = "游戏输赢汇总", description = "游戏输赢汇总")
 public class AppGameBettingCountDTO {
 
     @ApiModelProperty(value = "下单金额")

game-business/src/main/java/com/game/business/dto/AppGameBettingDetailsCountDTO.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel(description = "游戏输赢详情")
+@ApiModel(value = "游戏输赢详情", description = "游戏输赢详情")
 public class AppGameBettingDetailsCountDTO {
 
     @ApiModelProperty(value = "游戏ID")