修改内容：订单区服模糊查询；角色充值排行版是否退游字段判断修改

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

@@ -71,10 +71,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
             cri.where().andEquals("username", dto.getUsername());
         }
         if (StringUtils.isNotBlank(dto.getServerName())) {
-            cri.where().andEquals("server_name", dto.getServerName());
+            cri.where().andLike("server_name", dto.getServerName());
         }
         if (StringUtils.isNotBlank(dto.getSourceServerName())) {
-            cri.where().andEquals("source_server_name", dto.getSourceServerName());
+            cri.where().andLike("source_server_name", dto.getSourceServerName());
         }
         if (gameIds != null) {
             cri.where().andInList("order_game_id", gameIds);
@@ -200,10 +200,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
             cri.where().andEquals("username", dto.getUsername());
         }
         if (StringUtils.isNotBlank(dto.getServerName())) {
-            cri.where().andEquals("server_name", dto.getServerName());
+            cri.where().andLike("server_name", dto.getServerName());
         }
         if (StringUtils.isNotBlank(dto.getSourceServerName())) {
-            cri.where().andEquals("source_server_name", dto.getSourceServerName());
+            cri.where().andLike("source_server_name", dto.getSourceServerName());
         }
         if (gameIds != null) {
             cri.where().andInList("order_game_id", gameIds);

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

@@ -830,6 +830,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 	    IF(i.agent_id = 0 , '自然量', i.agent_name) as agent_name, -- 玩家注册渠道名
                 	    i.put_user_id as put_user_id, -- 投手id
                 	    i.user_active_time as user_active_time, -- 玩家最近活跃时间
+                	    TIMESTAMPDIFF(SECOND, i.user_active_time, NOW()) as user_active_until_now, -- 玩家最近活跃距今（秒）
                 	    i.user_last_recharge_game_id as user_last_recharge_game_id, -- 玩家最近充值游戏id
                 	    i.user_last_recharge_game_name as user_last_recharge_game_name, -- 玩家最近充值游戏名
                 		i.user_pay_time as user_pay_time, -- 玩家最近充值时间
@@ -843,7 +844,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, 0) as is_remove_game, -- 是否退游 1-是；0-否
+                		IFNULL(j.is_remove_game,
+                			IF(TIMESTAMPDIFF(HOUR, i.user_active_time, NOW()) > 72,
+                				IF(TIMESTAMPDIFF(HOUR, i.user_pay_time, NOW()) > 72 , 1, 0) , 0)) as is_remove_game, -- 是否退游 1-是；0-否
                 		IFNULL(j.is_wake_up, 0) as is_wake_up, -- 是否唤醒 1-是；0-否
                 		j.remark as remark, -- 备注
                 		j.gs_id as gs_id, -- GS_ID
@@ -1201,6 +1204,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         IF(i.agent_id = 0 , '自然量', i.agent_name) as agent_name, -- 玩家注册渠道名
                         i.put_user_id as put_user_id, -- 投手id
                         i.user_active_time as user_active_time, -- 玩家最近活跃时间
+                        TIMESTAMPDIFF(SECOND, i.user_active_time, NOW()) as user_active_until_now, -- 玩家最近活跃距今（秒）
                         i.user_last_recharge_game_id as user_last_recharge_game_id, -- 玩家最近充值游戏id
                         i.user_last_recharge_game_name as user_last_recharge_game_name, -- 玩家最近充值游戏名
                         i.user_pay_time as user_pay_time, -- 玩家最近充值时间
@@ -1214,7 +1218,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, 0) as is_remove_game, -- 是否退游 1-是；0-否
+                        IFNULL(j.is_remove_game,
+                            IF(TIMESTAMPDIFF(HOUR, i.user_active_time, NOW()) > 72,
+                                IF(TIMESTAMPDIFF(HOUR, i.user_pay_time, NOW()) > 72 , 1, 0) , 0)) as is_remove_game, -- 是否退游 1-是；0-否
                         IFNULL(j.is_wake_up, 0) as is_wake_up, -- 是否唤醒 1-是；0-否
                         j.remark as remark, -- 备注
                         j.gs_id as gs_id, -- GS_ID