:fix:流水监控增加字段

- 游戏名称
- 渠道名称

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

@@ -48,7 +48,7 @@ public class FlowMonitorVO implements Serializable {
      * 10点充值金额
      */
     @ApiModelProperty(value = "10点充值金额")
-    private Double tenAmount;
+    private Double tenAmount = 0.0;
     /**
      * 10点环比
      */
@@ -58,7 +58,7 @@ public class FlowMonitorVO implements Serializable {
      * 10点回收率
      */
     @ApiModelProperty(value = "10点回收率")
-    private Double tenRecovery;
+    private Double tenRecovery = 0.0;
     /**
      * 14点充值金额
      */
@@ -73,7 +73,7 @@ public class FlowMonitorVO implements Serializable {
      * 14点回收率
      */
     @ApiModelProperty(value = "14点回收率")
-    private Double fourteenRecovery;
+    private Double fourteenRecovery = 0.0;
     /**
      * 17点充值金额
      */
@@ -88,7 +88,7 @@ public class FlowMonitorVO implements Serializable {
      * 17点回收率
      */
     @ApiModelProperty(value = "17点回收率")
-    private Double seventeenRecovery;
+    private Double seventeenRecovery = 0.0;
     /**
      * 24点充值金额
      */
@@ -103,13 +103,24 @@ public class FlowMonitorVO implements Serializable {
      * 24点回收率
      */
     @ApiModelProperty(value = "24点回收率")
-    private Double twentyfourRecovery;
+    private Double twentyfourRecovery = 0.0;
 
     /**
      * 消耗
      */
     @ApiModelProperty(value = "消耗")
-    private Double costCount;
+    private Double costCount = 0.0;
 
+    /**
+     * 游戏名称
+     */
+    @ApiModelProperty(value = "游戏名称")
+    private String gameName;
+
+    /**
+     * 渠道名称
+     */
+    @ApiModelProperty(value = "渠道名称")
+    private String agentName;
 
 }

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

@@ -5325,8 +5325,10 @@ public class GameDataServiceImpl implements IGameDataService {
      */
     public String flowMonitorSql(FlowMonitorDTO dto, Criteria cri, Criteria criCost, String costTable, String orderTable) {
         String gameColumn = "game_id  ";
+        String gameNameColumn = "game_name ";
         if (dto.getGameDimension() != 1) {
             gameColumn = "parent_game_id ";
+            gameNameColumn = "parent_game_name ";
         }
 
         String sql =
@@ -5353,8 +5355,10 @@ public class GameDataServiceImpl implements IGameDataService {
                               s.pitcher_name, -- 投手名称
                               s.agent_id,
                               s.account_id,
-                              s.
-                              """ + gameColumn +
+                              s.agent_name,
+                              s. """ + gameNameColumn +
+                        """
+                              , s. """ + gameColumn +
                         """
                                       -- 游戏id
                                      
@@ -5381,7 +5385,11 @@ public class GameDataServiceImpl implements IGameDataService {
                                           a.pitcher_name, -- 投手名称
                                           a.agent_id,
                                           a.account_id,
-                                          a. """ + gameColumn + """       
+                                          a.agent_name,
+                                          a.
+                                          """ + gameNameColumn + """
+                                          , a. """ + gameColumn + """
+                                                 
                         FROM
                         		(
                         			SELECT
@@ -5399,7 +5407,9 @@ public class GameDataServiceImpl implements IGameDataService {
                                         pitcher_name,   
                                         agent_id,
                                         account_id,
-                                        """
+                                        agent_name,
+                                        """ + gameNameColumn +"""
+                         , """
                         + gameColumn +
                         """
                                     FROM