角色充值排行榜，是否退游添加字段

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

@@ -171,4 +171,10 @@ public class RoleRechargeRankingDTO extends BasePage {
     @ApiModelProperty(notes = "是否退游：1->退游;0->未退游")
     private Integer isRemoveGame;
 
+    /**
+     * 是否退游(系统判定)
+     */
+    @ApiModelProperty(notes = "是否退游：1->退游;0->未退游(系统判定)")
+    private Integer isRemoveGameForSystem;
+
 }

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

@@ -131,6 +131,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //是否退游
             criA.where().andEquals("is_remove_game", dto.getIsRemoveGame());
         }
+        if (dto.getIsRemoveGameForSystem() != null) {
+            //是否退游
+            criA.where().andEquals("is_remove_game_for_system", dto.getIsRemoveGameForSystem());
+        }
         //给充值时间查询条件
         Criteria criTodayAmount = Cnd.cri();
         //查询充值成功的
@@ -848,9 +852,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		j.add_corp_user_id as add_corp_user_id, -- 企微号
                 		j.user_wechat as user_wechat, -- 客户微信号
                 		j.user_phone as user_phone, -- 客户手机号
-                		IFNULL(j.is_remove_game,
-                  			IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
-                  				IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , NULL, 1) , NULL)) as is_remove_game, -- 是否退游 1-是；0-否;NULL-未操作过的数据（也代表未退游）
+                		IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
+                        				IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
+                        j.is_remove_game as is_remove_game, -- 是否退游 1-是;0-否;null-代表未操作数据
                 		j.is_wake_up as is_wake_up, -- 是否唤醒 1-是；0-否
                 		j.remark as remark, -- 备注
                 		j.gs_id as gs_id, -- GS_ID
@@ -1222,9 +1226,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         j.add_corp_user_id as add_corp_user_id, -- 企微号
                         j.user_wechat as user_wechat, -- 客户微信号
                         j.user_phone as user_phone, -- 客户手机号
-                        IFNULL(j.is_remove_game,
-                        			IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
-                        				IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , NULL, 1) , NULL)) as is_remove_game, -- 是否退游 1-是;0-否;-1-未操作过的数据（也代表未退游）
+                        IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
+                        				IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
+                        j.is_remove_game as is_remove_game, -- 是否退游 1-是;0-否;null-代表未操作数据
                         j.is_wake_up as is_wake_up, -- 是否唤醒 1-是；0-否
                         j.remark as remark, -- 备注
                         j.gs_id as gs_id, -- GS_ID