kk il y a 8 mois
Parent
commit
7dcfefbfe8

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

@@ -2,8 +2,8 @@ package com.game.business.controller;
 
 import cn.hutool.core.util.IdUtil;
 import com.game.business.domain.*;
-import com.game.business.dto.AppGameBettingCountDTO;
-import com.game.business.dto.AppGameBettingDetailsCountDTO;
+import com.game.business.vo.AppGameBettingCountVO;
+import com.game.business.vo.AppGameBettingDetailsCountVO;
 import com.game.business.service.*;
 import com.game.common.annotation.Anonymous;
 import com.game.common.core.controller.BaseController;
@@ -189,34 +189,34 @@ public class AppGameBettingController extends BaseController{
     @Anonymous
     @PostMapping(value = "/count")
     @ApiOperation(value = "游戏输赢统计(首页)", notes = "游戏输赢统计(首页)")
-    public HttpRet<AppGameBettingCountDTO> getCount(@RequestParam(name = "strDate") String strDate, @RequestParam(name = "userId") Long userId)
+    public HttpRet<AppGameBettingCountVO> getCount(@RequestParam(name = "strDate") String strDate, @RequestParam(name = "userId") Long userId)
     {
-        AppGameBettingCountDTO appGameBettingCountDTO = new AppGameBettingCountDTO();
+        AppGameBettingCountVO appGameBettingCountDTO = new AppGameBettingCountVO();
         List<AppGame> gameList = appGameService.selectAppGameList(new AppGame());
 
         if(gameList == null || gameList.isEmpty()){
             return HttpRet.success("查询成功",appGameBettingCountDTO);
         }
 
-        List<AppGameBettingDetailsCountDTO> countList = appGameBettingService.getCount(strDate, userId);
+        List<AppGameBettingDetailsCountVO> countList = appGameBettingService.getCount(strDate, userId);
         if(countList == null){
             countList = new ArrayList<>();
         }
-        Map<Long, List<AppGameBettingDetailsCountDTO>> idGameMap = countList.stream().collect(Collectors.groupingBy(AppGameBettingDetailsCountDTO::getGameId));
+        Map<Long, List<AppGameBettingDetailsCountVO>> idGameMap = countList.stream().collect(Collectors.groupingBy(AppGameBettingDetailsCountVO::getGameId));
 
-        List<AppGameBettingDetailsCountDTO> newList = new ArrayList<>();
+        List<AppGameBettingDetailsCountVO> newList = new ArrayList<>();
         double orderAmount = 0.00;
         double winAmount = 0.00;
         double loseAmount = 0.00;
         for (int i = 0; i < gameList.size(); i++) {
             AppGame appGame = gameList.get(i);
-            AppGameBettingDetailsCountDTO appGameBettingDetailsCountDTO = new AppGameBettingDetailsCountDTO();
+            AppGameBettingDetailsCountVO appGameBettingDetailsCountDTO = new AppGameBettingDetailsCountVO();
             appGameBettingDetailsCountDTO.setGameId(appGame.getId());
             appGameBettingDetailsCountDTO.setGameName(appGame.getName());
             appGameBettingDetailsCountDTO.setLogoUrl(appGame.getLogoUrl());
             appGameBettingDetailsCountDTO.setGamePath(appGame.getGamePath());
             if(idGameMap.containsKey(appGame.getId())){
-                AppGameBettingDetailsCountDTO dbAppGameBettingDetailsCount = idGameMap.get(appGame.getId()).get(0);
+                AppGameBettingDetailsCountVO dbAppGameBettingDetailsCount = idGameMap.get(appGame.getId()).get(0);
                 appGameBettingDetailsCountDTO.setBettingCount(dbAppGameBettingDetailsCount.getBettingCount());
                 appGameBettingDetailsCountDTO.setOrderAmount(dbAppGameBettingDetailsCount.getOrderAmount());
                 appGameBettingDetailsCountDTO.setWinAmount(dbAppGameBettingDetailsCount.getWinAmount());

+ 0 - 7
game-business/src/main/java/com/game/business/controller/AppGameLotteryController.java

@@ -2,11 +2,7 @@ package com.game.business.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.game.business.domain.AppGame;
-import com.game.business.domain.AppGameBetting;
 import com.game.business.domain.AppGameLottery;
-import com.game.business.dto.AppGameBettingDetailsCountDTO;
-import com.game.business.dto.AppGameLotteryDTO;
 import com.game.business.service.IAppGameLotteryService;
 import com.game.business.service.IAppGameService;
 import com.game.common.annotation.Anonymous;
@@ -21,10 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/business/lottery")

+ 2 - 2
game-business/src/main/java/com/game/business/mapper/AppGameBettingMapper.java

@@ -3,12 +3,12 @@ package com.game.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.game.business.domain.AppGameBetting;
-import com.game.business.dto.AppGameBettingDetailsCountDTO;
+import com.game.business.vo.AppGameBettingDetailsCountVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface AppGameBettingMapper extends BaseMapper<AppGameBetting> {
 
-    List<AppGameBettingDetailsCountDTO> getCount(@Param(value = "strDate") String strDate,@Param(value = "userId") Long userId);
+    List<AppGameBettingDetailsCountVO> getCount(@Param(value = "strDate") String strDate, @Param(value = "userId") Long userId);
 }

+ 2 - 2
game-business/src/main/java/com/game/business/service/IAppGameBettingService.java

@@ -2,7 +2,7 @@ package com.game.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.game.business.domain.AppGameBetting;
-import com.game.business.dto.AppGameBettingDetailsCountDTO;
+import com.game.business.vo.AppGameBettingDetailsCountVO;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ public interface IAppGameBettingService extends IService<AppGameBetting> {
 
     boolean save(AppGameBetting appGameBetting);
 
-    List<AppGameBettingDetailsCountDTO> getCount(String strDate, Long userId);
+    List<AppGameBettingDetailsCountVO> getCount(String strDate, Long userId);
 
     List<AppGameBetting> selectListByGameId(Long gameId, Long userId, Integer isWinning);
 }

+ 2 - 2
game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.game.business.domain.AppGameBetting;
-import com.game.business.dto.AppGameBettingDetailsCountDTO;
+import com.game.business.vo.AppGameBettingDetailsCountVO;
 import com.game.business.mapper.AppGameBettingMapper;
 import com.game.business.service.IAppGameBettingService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@ public class AppGameBettingServiceImpl extends ServiceImpl<AppGameBettingMapper,
     }
 
     @Override
-    public List<AppGameBettingDetailsCountDTO> getCount(String strDate, Long userId) {
+    public List<AppGameBettingDetailsCountVO> getCount(String strDate, Long userId) {
         return appGameBettingMapper.getCount(strDate, userId);
     }
 

+ 3 - 3
game-business/src/main/java/com/game/business/dto/AppGameBettingCountDTO.java → game-business/src/main/java/com/game/business/vo/AppGameBettingCountVO.java

@@ -1,4 +1,4 @@
-package com.game.business.dto;
+package com.game.business.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import java.util.List;
 
 @Data
 @ApiModel(value = "游戏输赢汇总", description = "游戏输赢汇总")
-public class AppGameBettingCountDTO {
+public class AppGameBettingCountVO {
 
     @ApiModelProperty(value = "下单金额")
     private double orderAmount;
@@ -20,5 +20,5 @@ public class AppGameBettingCountDTO {
     private double loseAmount;
 
     @ApiModelProperty(value = "游戏列表统计")
-    private List<AppGameBettingDetailsCountDTO> list;
+    private List<AppGameBettingDetailsCountVO> list;
 }

+ 2 - 2
game-business/src/main/java/com/game/business/dto/AppGameBettingDetailsCountDTO.java → game-business/src/main/java/com/game/business/vo/AppGameBettingDetailsCountVO.java

@@ -1,4 +1,4 @@
-package com.game.business.dto;
+package com.game.business.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,7 +6,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "游戏输赢详情", description = "游戏输赢详情")
-public class AppGameBettingDetailsCountDTO {
+public class AppGameBettingDetailsCountVO {
 
     @ApiModelProperty(value = "游戏ID")
     private Long gameId;

+ 2 - 2
game-business/src/main/java/com/game/business/dto/AppGameLotteryDTO.java → game-business/src/main/java/com/game/business/vo/AppGameLotteryVO.java

@@ -1,4 +1,4 @@
-package com.game.business.dto;
+package com.game.business.vo;
 
 import com.game.business.domain.AppGameLottery;
 import io.swagger.annotations.ApiModel;
@@ -7,7 +7,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "游戏开奖记录", description = "游戏开奖记录")
-public class AppGameLotteryDTO extends AppGameLottery {
+public class AppGameLotteryVO extends AppGameLottery {
 
     @ApiModelProperty(value = "游戏名称")
     private String gameName;

+ 1 - 1
game-business/src/main/resources/mapper/business/AppGameBettingMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.game.business.mapper.AppGameBettingMapper">
 
-    <select id="getCount" resultType="com.game.business.dto.AppGameBettingDetailsCountDTO">
+    <select id="getCount" resultType="com.game.business.vo.AppGameBettingDetailsCountVO">
         select
         game_id as gameId,
         count(id) as bettingCount,