修改内容：战力排行榜添加累计充值金额字段

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

@@ -109,7 +109,7 @@ public class AdsOrderDetailVO {
     @ApiModelProperty(notes = "支付方式名称")
     private String payway;
 
-    @ApiModelProperty(notes = "支付场景")
+    @ApiModelProperty(notes = "支付场景：支付类型, 1:PC, 2: h5支付, 3: App支付, 4: 小程序支付, 5: 米大师支付")
     private String payScene;
 
     @ApiModelProperty(notes = "收款账户")

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

@@ -3075,6 +3075,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		role_name,
                 		role_level ,
                 		role_vip ,
+                		total_amount ,
                 		combat_num ,
                 		ROW_NUMBER()over(partition by source_system ,server_id ,super_game_id order by combat_num desc) as rank_num
                 	FROM (
@@ -3085,12 +3086,23 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			MIN(`date`) as dt,
                 			MAX(merge_time) as merge_time ,
                 			role_id ,
+                			SUM(role_total_amount) as total_amount ,
                 			MAX(role_name) as role_name,
                 			MAX(role_level) as role_level ,
                 			MAX(role_vip) as role_vip ,
                 			MAX(combat_num) as combat_num
-                		FROM game_ads.ads_role_combat_num_ranking
-                		GROUP BY role_id , source_system ,super_game_id, server_id
+                		FROM game_ads.ads_role_combat_num_ranking a
+                		LEFT JOIN (
+                			SELECT
+                				source_system as b_source_system,
+                				server_id as b_server_id,
+                				game_id as b_game_id,
+                				MAX(is_merge) as b_is_merge
+                			FROM dm_game_order.t_game_server_merge
+                			GROUP BY source_system , server_id , game_id
+                		) b on a.source_system = b.b_source_system AND a.boss_server_id = b.b_server_id AND a.super_game_id = b.b_game_id
+                		WHERE b_is_merge = 0
+                		GROUP BY role_id , source_system ,super_game_id, server_id , boss_server_id
                 	) a
                 ) a
                 """;
@@ -3114,6 +3126,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		role_name,
                 		role_level ,
                 		role_vip ,
+                		total_amount ,
                 		combat_num ,
                 		ROW_NUMBER()over(partition by source_system ,boss_server_id ,super_game_id order by combat_num desc) as rank_num
                 	FROM (
@@ -3123,6 +3136,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			super_game_id ,
                 			MIN(merge_time) as merge_time ,
                 			role_id ,
+                			SUM(role_total_amount) as total_amount ,
                 			MAX(role_name) as role_name,
                 			MAX(role_level) as role_level ,
                 			MAX(role_vip) as role_vip ,