:feat:投手每日数据列表总计返回用户id

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/PitcherDataDayTotalVO.java

@@ -2126,4 +2126,7 @@ public class PitcherDataDayTotalVO {
     @ApiModelProperty(value = "付费趋势总：增/回/倍")
     private RechargeTrendVO amountSumTrend;
 
+    @ApiModelProperty(value = "da1的用户详情")
+    private FirstNewUserAgainTrendVO userDetails;
+
 }

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

@@ -5145,7 +5145,7 @@ public class GameDataServiceImpl implements IGameDataService {
         }
         //拼接投手id
         if(StringUtils.isNotBlank(againTrendVO.getPitcherId())){
-            queryStr.append("and pitcher_id = '")
+            queryStr.append("and pitcher_ id = '")
                     .append(againTrendVO.getPitcherId().trim())
                     .append("'");
         }

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

@@ -388,7 +388,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
     public PitcherDataDayTotalVO getPitcherDataDayTotal(PitcherDataDayTotalDTO dto) {
         com.github.sd4324530.jtuple.Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
         List<Long> userIds = CollectionUtils.isEmpty(dto.getPitcherId()) ? poerInfo.first : dto.getPitcherId();
-
+//        List<Long> userIds = CollectionUtils.isEmpty(dto.getPitcherId()) ? null : dto.getPitcherId();
         //不传递时间，默认查询当天
         if (dto.getBeginDate() == null || dto.getEndDate() == null) {
             dto.setBeginDate(LocalDate.now());
@@ -421,11 +421,23 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
         //执行sql
         dao.execute(sql);
         PitcherDataDayTotalVO vo = sql.getObject(PitcherDataDayTotalVO.class);
+
+        PitcherDataDayDTO pitcherDataDayDTO = new PitcherDataDayDTO();
+        BeanUtils.copyProperties(dto, pitcherDataDayDTO);
+        //查询用户id
+        Map<String, String> map = findUsersIdForGameData(pitcherDataDayDTO);
+
+        Long[] ids = ArrayUtils.EMPTY_LONG_OBJECT_ARRAY;
+
+        String idStr = map.values().stream().filter(string -> !string.isEmpty()).collect(Collectors.joining("/"));
+        if (StringUtils.isNotBlank(idStr)) {
+            ids = Arrays.stream(idStr.split("/")).map(Long::parseLong).toArray(Long[]::new);
+        }
+        vo.setUserDetails(new FirstNewUserAgainTrendVO().builder().usersId(ids).build());
         if (StringUtils.isNotBlank(vo.getAmountD1())) {
             //处理dayN数据
             formatPitcherDataDayTotalDayN(vo);
         }
-
         return vo;
     }
 
@@ -439,7 +451,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
     public Page<PitcherDataTotalVO> getPitcherDataTotal(PitcherDataTotalDTO dto) {
         com.github.sd4324530.jtuple.Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
         List<Long> userIds = CollectionUtils.isEmpty(dto.getPitcherId()) ? poerInfo.first : dto.getPitcherId();
-
+//        List<Long> userIds = CollectionUtils.isEmpty(dto.getPitcherId()) ? null : dto.getPitcherId();
         //如果注册时间参数为空，默认设置查询当天数据
         if (dto.getBeginDate() == null || dto.getEndDate() == null) {
             dto.setBeginDate(LocalDate.now());