| 
					
				 | 
			
			
				@@ -673,16 +673,16 @@ public class RoleManageServiceImpl implements IRoleManageService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		i.user_pay_time as user_pay_time, -- 玩家最近充值时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		TIMESTAMPDIFF(SECOND, i.user_create_time, i.user_pay_time) as user_reg_pay_time, -- 玩家注册充值时间差(秒) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		TIMESTAMPDIFF(SECOND, i.user_pay_time, NOW()) as user_pay_until_now, -- 玩家最近充值距今(秒) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                		j.is_send_mail as is_send_mail, -- 是否发送邮件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                		IFNULL(j.is_send_mail, 0) as is_send_mail, -- 是否发送邮件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		j.send_gift_id as send_gift_id, -- 最新发送礼包id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		k.gift_name as gift_name, -- 礼包名 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                		j.is_change_game_type as is_change_game_type, -- 是否转端 1-是;0-否 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                		j.is_add_corp_wechat as is_add_corp_wechat, -- 是否添加企微 1-是; 0-否 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                		IFNULL(j.is_change_game_type, 0) as is_change_game_type, -- 是否转端 1-是;0-否 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                		IFNULL(j.is_add_corp_wechat, 0) as is_add_corp_wechat, -- 是否添加企微 1-是; 0-否 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		j.add_corp_user_id as add_corp_user_id, -- 企微号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		j.user_wechat as user_wechat, -- 客户微信号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		j.user_phone as user_phone, -- 客户手机号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                		j.is_remove_game as is_remove_game, -- 是否退游 1-是;0-否 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                		j.is_wake_up as is_wake_up, -- 是否唤醒 1-是;0-否 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                		IFNULL(j.is_remove_game, 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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 		j.customer_service_id as customer_service_id, -- 客服ID 
			 |