推广数据-修改参数类型

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteDayDTO.java

@@ -18,7 +18,7 @@ public class GamePromoteDayDTO extends BasePage {
     @ApiModelProperty(notes = "SDK来源")
     private String sourceSystem;
     @ApiModelProperty(notes = "投手id")
-    private List<Long> sysUserId;
+    private String sysUserId;
     @ApiModelProperty(notes = "推广账号类型")
     private String accountType;
     @ApiModelProperty(notes = "推广账号ID")

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteDayTotalDTO.java

@@ -17,7 +17,7 @@ public class GamePromoteDayTotalDTO {
     @ApiModelProperty(notes = "SDK来源")
     private String sourceSystem;
     @ApiModelProperty(notes = "投手id")
-    private List<Long> sysUserId;
+    private String sysUserId;
     @ApiModelProperty(notes = "推广账号ID")
     private String accountId;
     @ApiModelProperty(notes = "推广账号类型")

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

@@ -53,7 +53,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
     @Override
     public Page<GamePromoteDayVO> accountAgentDay(GamePromoteDayDTO dto) {
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
-        List<Long> userIds = CollectionUtils.isEmpty(dto.getSysUserId()) ? poerInfo.first : dto.getSysUserId();
+        List<Long> userIds = StringUtils.isBlank(dto.getSysUserId()) ? poerInfo.first : List.of(Long.valueOf(dto.getSysUserId()));
         List<Long> gameIds = CollectionUtils.isEmpty(dto.getGameId()) ? poerInfo.second : dto.getGameId();
 
         if (null == dto.getBeginDay() || null == dto.getEndDay()) {
@@ -264,7 +264,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
     @Override
     public GamePromoteDayTotalVO accountAgentDayTotal(GamePromoteDayTotalDTO dto) {
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
-        List<Long> userIds = CollectionUtils.isEmpty(dto.getSysUserId()) ? poerInfo.first : dto.getSysUserId();
+        List<Long> userIds = StringUtils.isBlank(dto.getSysUserId()) ? poerInfo.first : List.of(Long.valueOf(dto.getSysUserId()));
         List<Long> gameIds = CollectionUtils.isEmpty(dto.getGameId()) ? poerInfo.second : dto.getGameId();
 
         if (null == dto.getBeginDay() || null == dto.getEndDay()) {

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

@@ -5026,11 +5026,11 @@ public class GameDataServiceImpl implements IGameDataService {
             queryStr.append(" INTERVAL 0 day)");
         }
         //拼接sourceSystem条件
-        if (againTrendVO.getSourceSystem() != null) {
+        if (StringUtils.isNotBlank(againTrendVO.getSourceSystem())) {
             queryStr.append(" and source_system = '")
                     .append(againTrendVO.getSourceSystem())
                     .append("'");
-        } else if (dto.getSourceSystem() != null) {
+        } else if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             queryStr.append(" and source_system = '")
                     .append(dto.getSourceSystem())
                     .append("'");