修改内容：复充趋势

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

@@ -53,7 +53,7 @@ public class AccountAgentDayController {
     }
 
     @ApiOperation(value = "推广渠道每日复充数据")
-    @PreAuthorize(permissionKey = "gameData:promote:again")
+    @PreAuthorize(permissionKey = "gameData:accountAgent:again")
     @PostMapping("/again")
     public ResultVO<Map<LocalDate, List<AgentDayAgainVO>>> accountAgentDayAgain(@RequestBody AgentDayAgainDTO dto) throws Exception {
         return ResultVO.ok(accountAgentDayService.accountAgentDayAgain(dto));

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

@@ -36,7 +36,7 @@ public class GameDataController {
     private IGameDataService gameDataService;
 
     @ApiOperation(value = "游戏每日数据")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:day")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:day")
     @PostMapping("/day")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<Page<GameDataDayVO>> getGameDataDay(@RequestBody GameDataDayDTO dto) {
@@ -50,7 +50,7 @@ public class GameDataController {
         return ResultVO.ok(gameDataService.getH5Recharge(dto));
     }
     @ApiOperation(value = "游戏总数据")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:total")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:total")
     @PostMapping("/total")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataTotalVO.class)})
     public ResultVO<Page<GameDataTotalVO>> getGameDataTotal(@RequestBody GameDataTotalDTO dto) {
@@ -65,7 +65,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "游戏每日复充数据")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:again")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:again")
     @PostMapping("/again")
     public ResultVO<Map<LocalDate, List<GameDataAgainDayVO>>> getGameDataAgainDay(@RequestBody GameDataAgainDayDTO dto) throws Exception {
         return ResultVO.ok(gameDataService.getGameDataAgainDay(dto));

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

@@ -1,6 +1,5 @@
 package com.zanxiang.game.data.serve.controller;
 
-import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.pojo.dto.OverallSummaryDTO;
 import com.zanxiang.game.data.serve.pojo.vo.OverallSummaryLineDataVO;
 import com.zanxiang.game.data.serve.pojo.vo.OverallSummaryVO;
@@ -34,7 +33,7 @@ public class OverallSummaryController {
     private IOverallSummaryService overallSummaryService;
 
     @ApiOperation(value = "获取整体概况数据")
-    @PreAuthorize(permissionKey = "gameData:adsOverallSummary:totalData")
+    //@PreAuthorize(permissionKey = "gameData:adsOverallSummary:totalData")
     @PostMapping("/totalData")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OverallSummaryVO.class)})
     public ResultVO<OverallSummaryVO> getOverallSummaryTotalData(@RequestBody OverallSummaryDTO dto) {
@@ -42,7 +41,7 @@ public class OverallSummaryController {
     }
 
     @ApiOperation(value = "获取折线图数据")
-    @PreAuthorize(permissionKey = "gameData:adsOverallSummary:lineData")
+    //@PreAuthorize(permissionKey = "gameData:adsOverallSummary:lineData")
     @PostMapping("/lineData")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OverallSummaryLineDataVO.class, responseContainer = "list")})
     public ResultVO<List<OverallSummaryLineDataVO>> getOverallSummaryLineData(@RequestBody OverallSummaryDTO dto) {

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

@@ -19,6 +19,22 @@ import java.math.BigDecimal;
 @Builder
 public class AgentDayAgainVO {
 
+    /**
+     * 充值次数
+     */
+    @ApiModelProperty(value =
+            """
+            C1 -> 充值一次
+            C2 -> 充值大于一次
+            C3 -> 充值大于两次
+            C4 -> 充值大于三次
+            C5 -> 充值大于四次
+            C6 -> 充值大于五次
+            C7 -> 充值大于十次
+            C8 -> 充值大于二十次
+            """)
+    private String cn;
+
     /**
      * 原
      */

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

@@ -20,6 +20,22 @@ import java.math.BigDecimal;
 @Builder
 public class GameDataAgainDayVO {
 
+    /**
+     * 充值次数
+     */
+    @ApiModelProperty(value =
+            """
+            C1 -> 充值一次
+            C2 -> 充值大于一次
+            C3 -> 充值大于两次
+            C4 -> 充值大于三次
+            C5 -> 充值大于四次
+            C6 -> 充值大于五次
+            C7 -> 充值大于十次
+            C8 -> 充值大于二十次
+            """)
+    private String cn;
+
     /**
      * 原(总量)
      */

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

@@ -7,7 +7,8 @@ import com.zanxiang.game.data.serve.pojo.dto.AgentDayAgainDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayTotalDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GamePromoteTotalDTO;
-import com.zanxiang.game.data.serve.pojo.entity.*;
+import com.zanxiang.game.data.serve.pojo.entity.AdsAccountAgentDay;
+import com.zanxiang.game.data.serve.pojo.entity.AdsAgentDayAgain;
 import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
 import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.IAccountAgentDayService;
@@ -35,13 +36,9 @@ import org.springframework.util.CollectionUtils;
 
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
-
 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;
 
 @Slf4j
@@ -495,11 +492,16 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         List<AdsAgentDayAgain> list = againSql.getList(AdsAgentDayAgain.class);
 
         //创建Map记录数据
-        Map<LocalDate, List<AgentDayAgainVO>> map = new HashMap<>();
+        Map<LocalDate, List<AgentDayAgainVO>> map = new TreeMap<>(
+                (o1, o2) -> o1.isBefore(o2) == true ? -1 : 1);
         //有序存储每个list,每个list包含当天的所有充值次数的复充数据
         List<List<AgentDayAgainVO>> tempList = new ArrayList<>();
         //记录查询出的记录条数
         int count = list.size();
+        //没有数据直接返回空结果
+        if (count == 0){
+            return map;
+        }
         //初始化list
         initList(tempList, count);
 
@@ -508,6 +510,8 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
             //用来计算Ci
             int ci = i + 1;
             //第一天的所有充值次数都是先计算的
+            //充值次数
+            tempList.get(0).get(i).setCn("C" + ci);
             AgentDayAgainVO tempVO = tempList.get(0).get(i);
             //"原": Ci
             tempList.get(0).get(i).setOriginal(getCnByNum(list.get(0), ci));
@@ -526,6 +530,8 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
 
             //计算第2-n天的数据 复充次数i的数据
             for (int j = 1; j < count; j++) {
+                //充值次数
+                tempList.get(j).get(i).setCn("C" + ci);
                 //"原":前一天的"现"
                 tempList.get(j).get(i).setOriginal(tempList.get(j - 1).get(i).getPresent());
                 //"现":当天的Ci - 当天的C(i+1)

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

@@ -748,13 +748,17 @@ public class GameDataServiceImpl implements IGameDataService {
         log.info("listBuy长度：" + listBuy.size());
         log.info("listNature长度：" + listNature.size());
 
-
         //创建Map记录数据
-        Map<LocalDate, List<GameDataAgainDayVO>> map = new HashMap<>();
+        Map<LocalDate, List<GameDataAgainDayVO>> map = new TreeMap<>(
+                (o1, o2) -> o1.isBefore(o2) == true ? -1 : 1);
         //有序存储每个list,每个list包含当天的所有充值次数的复充数据
         List<List<GameDataAgainDayVO>> tempList = new ArrayList<>();
         //记录查询出的记录条数
         int count = list.size();
+        //如果长度为0返回空结果
+        if (count == 0){
+            return map;
+        }
         //初始化list
         initList(tempList, count);
 
@@ -764,6 +768,8 @@ public class GameDataServiceImpl implements IGameDataService {
             int ci = i + 1;
             //第一天的所有充值次数都是先计算的
             GameDataAgainDayVO tempVO = tempList.get(0).get(i);
+            //设置充值次数
+            tempList.get(0).get(i).setCn("C" + ci);
             //"原": Ci
             tempList.get(0).get(i).setOriginal(getCnByNum(list.get(0), ci));
             tempList.get(0).get(i).setBuyOriginal(getCnByNum(listBuy.get(0), ci));
@@ -799,6 +805,8 @@ public class GameDataServiceImpl implements IGameDataService {
 
             //计算第2-n天的数据 复充次数i的数据
             for (int j = 1; j < count; j++) {
+                //设置充值次数
+                tempList.get(j).get(i).setCn("C" + ci);
                 //"原":前一天的"现"
                 tempList.get(j).get(i).setOriginal(tempList.get(j - 1).get(i).getPresent());
                 tempList.get(j).get(i).setBuyOriginal(tempList.get(j - 1).get(i).getBuyPresent());