:fix:改成非原始服条件

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleRechargeRankingDTO.java

@@ -61,7 +61,7 @@ public class RoleRechargeRankingDTO extends BasePage {
      * 是否合服
      */
     @ApiModelProperty(value = "是否合服：true -> 合服 ； false -> 不合服")
-    private Boolean isMergeServer;
+    private Boolean isMergeServer = false;
 
     /**
      * 角色名

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

@@ -67,13 +67,18 @@ public class RoleManageServiceImpl implements IRoleManageService {
         Criteria criA = getSqlByQuery(dto);
         //给充值时间查询条件
         Criteria criTodayAmount = getDateSqlByQuery(dto);
+        //判断是否合服 默认不合服
+        String margeSql = "is_merge = 0";
+        if(dto.getIsMergeServer()){
+            margeSql = "is_source_server = 0";
+        }
         //分页对象
         Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
 
         StopWatch watch = new StopWatch();
         watch.start();
         //查询总记录数
-        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount));
+        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount,margeSql));
         countSql.setCallback(Sqls.callback.integer());
         dao.execute(countSql);
         watch.stop();
@@ -91,7 +96,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         //创建sql
         StopWatch watch2 = new StopWatch();
         watch2.start();
-        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount));
+        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount,margeSql));
         sql.setCallback(Sqls.callback.maps());
         sql.setPager(pager);
         dao.execute(sql);
@@ -154,11 +159,16 @@ public class RoleManageServiceImpl implements IRoleManageService {
         Criteria criTodayAmount = getDateSqlByQuery(dto);
         //分页对象
         Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
+        //判断是否合服 默认不合服
+        String margeSql = "is_merge = 0";
+        if(dto.getIsMergeServer()){
+            margeSql = "is_source_server = 0";
+        }
 
         StopWatch watch = new StopWatch();
         watch.start();
         //查询总记录数
-        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount));
+        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount,margeSql));
         countSql.setCallback(Sqls.callback.integer());
         dao.execute(countSql);
         watch.stop();
@@ -176,7 +186,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         //创建sql
         StopWatch watch2 = new StopWatch();
         watch2.start();
-        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount));
+        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount,margeSql));
         sql.setCallback(Sqls.callback.maps());
         sql.setPager(pager);
         dao.execute(sql);
@@ -705,8 +715,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
         } else {
             criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
         }
+        //判断是否合服 默认不合服
+        String margeSql = "is_merge = 0";
+        if(dto.getIsMergeServer()){
+            margeSql = "is_source_server = 0";
+        }
         //创建sql
-        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount));
+        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount,margeSql));
         sql.setCallback(Sqls.callback.maps());
         dao.execute(sql);
         return sql.getList(Map.class);
@@ -1451,7 +1466,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @param criTodayAmount 当天充值金额相关的查询条件
      * @return String
      */
-    private String getRoleRechargeRankingSql(Criteria criA, Criteria criTodayAmount) {
+    private String getRoleRechargeRankingSql(Criteria criA, Criteria criTodayAmount,String margeSql) {
         return """
                 SELECT
                 	*
@@ -1674,7 +1689,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                     server_id,
                                     server_name
                                 FROM dm_game_order.t_game_server_merge
-                                WHERE is_source_server = 0  AND is_delete = 0
+                                WHERE   
+                                """ + margeSql + """ 
+                                AND is_delete = 0
                             ) r on a.source_system = r.source_system AND a.server_id = r.source_server_ids AND d.super_game_id = r.game_id
                             LEFT JOIN (
                                 -- 玩家信息
@@ -2280,7 +2297,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @param criTodayAmount 今日充值条件
      * @return String
      */
-    private String getCountNumSql2(Criteria criA, Criteria criTodayAmount) {
+    private String getCountNumSql2(Criteria criA, Criteria criTodayAmount,String margeSql) {
         return """
                 SELECT
                     COUNT(1)
@@ -2488,7 +2505,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                     server_id,
                                     server_name
                                 FROM dm_game_order.t_game_server_merge
-                                WHERE is_merge = 0 AND is_delete = 0
+                                WHERE  
+                                 """ + margeSql + """ 
+                                  AND is_delete = 0
                             ) r on a.source_system = r.source_system AND a.server_id = r.source_server_ids AND d.super_game_id = r.game_id
                             LEFT JOIN (
                                 SELECT