修改内容：修改bug

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

@@ -70,7 +70,7 @@ 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().andEquals("source_server_name", dto.getServerName());
         }
         if (gameIds != null) {
             cri.where().andInList("order_game_id", gameIds);
@@ -152,7 +152,13 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
         sql.setPager(pager);
         //执行获取结果
         dao.execute(sql);
-        List<AdsOrderDetailVO> list = sql.getList(AdsOrderDetailVO.class);
+        List<AdsOrderDetailVO> list = sql.getList(AdsOrderDetailVO.class).stream().map(vo -> {
+            //去除‘null’字符串
+            if ("null".equals(vo.getPayAccountId())) {
+                vo.setPayAccountId(null);
+            }
+            return vo;
+        }).collect(Collectors.toList());
 
         return new Page<>(list, pager);
     }
@@ -186,7 +192,7 @@ 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().andEquals("source_server_name", dto.getServerName());
         }
         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

@@ -124,7 +124,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
             criA.where().andGTE("amount", dto.getTotalRechargeMin());
         }
         if (dto.getTotalRechargeMax() != null) {
-            //累计充值金额最小值
+            //累计充值金额最大值
             criA.where().andLTE("amount", dto.getTotalRechargeMax());
         }
         //给充值时间查询条件