Merge remote-tracking branch 'origin/package' into package

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/RankingController.java

@@ -38,7 +38,7 @@ public class RankingController {
     private IAdsAgentRechargeRankingService adsAgentRechargeRankingService;
 
     @ApiOperation(value = "游戏充值排行榜")
-    @PreAuthorize(permissionKey = "gameData:ranking:game")
+//    @PreAuthorize(permissionKey = "gameData:ranking:game")
     @PostMapping("/game")
     public ResultVO<Page<GameRechargeRankingVO>> gameRanking(@RequestBody RechargeRankingDTO dto) {
         return ResultVO.ok(rankingService.gameRanking(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/PlayerTemplateVO.java

@@ -22,7 +22,7 @@ public class PlayerTemplateVO {
      * 玩家模板排序
      */
     @ApiModelProperty("玩家模板排序")
-    private String userOrderBy;
+    private Integer userOrderBy;
 
     /**
      * 用户ID

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/RechargeTemplateVO.java

@@ -22,7 +22,7 @@ public class RechargeTemplateVO {
      * 充值模板排序
      */
     @ApiModelProperty("充值模板排序")
-    private String amountOrderBy;
+    private Integer amountOrderBy;
 
     /**
      * 充值挡位

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameDataServiceImpl.java

@@ -38,10 +38,7 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -629,7 +626,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                 rechargeTemplateVOList.add(RechargeTemplateVO.builder()
                                         .amountCount(adsEverydayWater.getAmountCount())
                                         .amountNum(adsEverydayWater.getAmountNum())
-                                        .amountOrderBy(adsEverydayWater.getAmountOrderBy())
+                                        .amountOrderBy(Integer.valueOf(adsEverydayWater.getAmountOrderBy()))
                                         .amountPost(adsEverydayWater.getAmountPost())
                                         .build());
                             }
@@ -637,7 +634,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                 playerTemplateVOS.add(PlayerTemplateVO.builder()
                                         .userId(adsEverydayWater.getUserId())
                                         .userAmount(adsEverydayWater.getUserAmount())
-                                        .userOrderBy(adsEverydayWater.getUserOrderBy())
+                                        .userOrderBy(Integer.valueOf(adsEverydayWater.getUserOrderBy()))
                                         .userName(adsEverydayWater.getUserName())
                                         .proportion(
                                                 item.getAmount().compareTo(BigDecimal.ZERO) == 0 ?
@@ -647,8 +644,8 @@ public class GameDataServiceImpl implements IGameDataService {
                                         .build());
                             }
                         });
-                        item.setRechargeTemplateVOList(rechargeTemplateVOList);
-                        item.setPlayerTemplateVOS(playerTemplateVOS);
+                        item.setRechargeTemplateVOList(rechargeTemplateVOList.stream().sorted(Comparator.comparing(RechargeTemplateVO::getAmountOrderBy)).collect(Collectors.toList()));
+                        item.setPlayerTemplateVOS(playerTemplateVOS.stream().sorted(Comparator.comparing(PlayerTemplateVO::getUserOrderBy)).collect(Collectors.toList()));
                     }
                     return item;
                 }).collect(Collectors.toList());

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RankingServiceImpl.java

@@ -64,15 +64,15 @@ public class RankingServiceImpl implements IRankingService {
                 sum(today_amount) as today_amount,
                 sum(today_buy_amount) as today_buy_amount,
                 sum(today_nature_amount) as today_nature_amount,
-                sum(total_amount) as total_amount,
-                sum(total_buy_amount) as total_buy_amount,
-                sum(total_nature_amount) as total_nature_amount,
-                round(if(sum(total_recharge_count) > 0, sum(total_amount) / sum(total_recharge_count), 0), 2) as avg_amount,
+                max(total_amount) as total_amount,
+                max(total_buy_amount) as total_buy_amount,
+                max(total_nature_amount) as total_nature_amount,
+                max(avg_amount) as avg_amount,
                 sum(reg_user_count) as reg_user_count,
-                sum(total_recharge_user_count) as total_recharge_user_count,
-                sum(total_recharge_count) as total_recharge_count,
-                sum(total_cost) as total_cost,
-                round(if(sum(total_cost) > 0, sum(total_buy_amount) / sum(total_cost), 0), 4) as total_roi
+                max(total_recharge_user_count) as total_recharge_user_count,
+                max(total_recharge_count) as total_recharge_count,
+                max(total_cost) as total_cost,
+                max(total_roi) as total_roi
                 from ads_game_recharge_ranking
                 """;
     }
@@ -118,11 +118,11 @@ public class RankingServiceImpl implements IRankingService {
                 max(reg_game_name) as reg_game_name,
                 max(player_os) as player_os,
                 sum(today_total_amount) as today_total_amount,
-                sum(first_amount) as first_amount,
-                sum(last_amount) as last_amount,
-                sum(total_amount) as total_amount,
-                round(if(sum(total_amount_count) > 0, sum(total_amount) / sum(total_amount_count), 0), 2) as avg_amount,
-                sum(total_amount_count) as total_amount_count,
+                max(first_amount) as first_amount,
+                max(last_amount) as last_amount,
+                max(total_amount) as total_amount,
+                max(avg_amount) as avg_amount,
+                max(total_amount_count) as total_amount_count,
                 max(last_amount_game_id) as last_amount_game_id,
                 max(last_amount_game_name) as last_amount_game_name,
                 max(last_amount_time) as last_amount_time