|
@@ -264,7 +264,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
|
|
List<PitcherDataDayVO> list = tempList.stream().map(vo -> {
|
|
List<PitcherDataDayVO> list = tempList.stream().map(vo -> {
|
|
Long[] usersID = ArrayUtils.EMPTY_LONG_OBJECT_ARRAY;
|
|
Long[] usersID = ArrayUtils.EMPTY_LONG_OBJECT_ARRAY;
|
|
//将pitcherId和需要查询的注册时间拼接
|
|
//将pitcherId和需要查询的注册时间拼接
|
|
- String pitcherIdDate = vo.getPitcherId() + "/" + dto.getBeginDate();
|
|
|
|
|
|
+ String pitcherIdDate = vo.getPitcherId() + "/" + vo.getDt();
|
|
//取出所有usersId
|
|
//取出所有usersId
|
|
if (map.containsKey(pitcherIdDate)) {
|
|
if (map.containsKey(pitcherIdDate)) {
|
|
//string[] -> Long[]
|
|
//string[] -> Long[]
|
|
@@ -325,7 +325,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
|
|
findUsersCri.where().andNotEquals("reg_agent_id", 0);
|
|
findUsersCri.where().andNotEquals("reg_agent_id", 0);
|
|
Sql findUsersIdSql;
|
|
Sql findUsersIdSql;
|
|
Criteria groupByCri = Cnd.cri();
|
|
Criteria groupByCri = Cnd.cri();
|
|
- groupByCri.getGroupBy().groupBy("pitcher_id", "DATE(reg_user_time)");
|
|
|
|
|
|
+ groupByCri.getGroupBy().groupBy("pitcher_id", "DATE(dt)");
|
|
findUsersIdSql = Sqls.create(findUsersIdSql(findUsersCri, groupByCri));
|
|
findUsersIdSql = Sqls.create(findUsersIdSql(findUsersCri, groupByCri));
|
|
//自定义回传
|
|
//自定义回传
|
|
findUsersIdSql.setCallback((connection, resultSet, sql) -> {
|
|
findUsersIdSql.setCallback((connection, resultSet, sql) -> {
|
|
@@ -349,7 +349,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
|
|
private String findUsersIdSql(Criteria cri, Criteria groupByCri) {
|
|
private String findUsersIdSql(Criteria cri, Criteria groupByCri) {
|
|
return """
|
|
return """
|
|
SELECT
|
|
SELECT
|
|
- CONCAT(pitcher_id,'/',DATE(reg_user_time)) as game_id_date,
|
|
|
|
|
|
+ CONCAT(pitcher_id,'/',DATE(dt)) as game_id_date,
|
|
GROUP_CONCAT(CONVERT (player_id, varchar), "/") as amount_users_id
|
|
GROUP_CONCAT(CONVERT (player_id, varchar), "/") as amount_users_id
|
|
FROM
|
|
FROM
|
|
game_ads.ads_player_recharge_ranking
|
|
game_ads.ads_player_recharge_ranking
|