修改内容：角色充值排行榜

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

@@ -8,6 +8,7 @@ import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
 import com.zanxiang.game.data.serve.service.IRoleManageService;
 import com.zanxiang.game.data.serve.utils.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.nutz.dao.Cnd;
@@ -52,6 +53,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (dto.getGameId() != null) {
             criA.where().andEquals("role_reg_game_id", dto.getGameId());
         }
+        if (dto.getParentGameId() != null) {
+            //角色注册父游戏
+            criA.where().andEquals("role_reg_parent_game_id", dto.getParentGameId());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             criA.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -61,13 +66,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isNotBlank(dto.getRoleName())) {
             criA.where().andLike("role_name", dto.getRoleName());
         }
-        if (dto.getServerIds() != null) {
+        if (CollectionUtils.isNotEmpty(dto.getServerIds())) {
             //区服列表查询
             criA.where().andInList("server_id", dto.getServerIds());
         }
         if (dto.getCreateRoleBeginDate() != null && dto.getCreateRoleEndDate() != null) {
             //角色创建时间
-            criA.where().andBetween("role_create_time", dto.getCreateRoleBeginDate(), dto.getCreateRoleEndDate());
+            criA.where().andBetween("DATE(role_create_time)", dto.getCreateRoleBeginDate(), dto.getCreateRoleEndDate());
         }
         if (dto.getVipLevel() != null) {
             criA.where().andEquals("vip_level", dto.getVipLevel());
@@ -76,7 +81,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
             criA.where().andEquals("is_send_mail", dto.getIsSendMail());
         }
         if (dto.getIsChange() != null) {
-            criA.where().andEquals("is_change", dto.getIsChange());
+            //是否转端
+            criA.where().andEquals("is_change_game_type", dto.getIsChange());
         }
         if (StringUtils.isNotBlank(dto.getWeChatCompany())) {
             criA.where().andLike("we_chat_company", dto.getWeChatCompany());
@@ -183,7 +189,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      */
     private Map<String, Object> getNameById(Map<String, Object> dataMap){
 
-        //投手名
+        /*//投手名
         if (dataMap.get("put_user_id") != null) {
             dataMap.put("put_user_name",
                     sysUserRpc.getById(Long.valueOf((String) dataMap.get("put_user_id"))).getData().getNickname());
@@ -202,7 +208,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (dataMap.get("customer_service_id") != null) {
             dataMap.put("customer_service_name",
                     sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData().getNickname());
-        }
+        }*/
 
         return dataMap;
     }