修改内容：玩家数据渠道多选；自然量修改

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author tianhua
@@ -104,7 +105,7 @@ public class PlayerDataListDTO extends BasePage {
      * 注册渠道对应的id
      */
     @ApiModelProperty(notes = "注册渠道对应的id")
-    private Long channelId;
+    private List<String> channelId;
 
     /**
      * 归因推广账号

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author tianhua
@@ -80,7 +81,7 @@ public class PlayerRoleDataListDTO extends BasePage {
      * 注册渠道对应的id
      */
     @ApiModelProperty(notes = "注册渠道对应的id")
-    private Long channelId;
+    private List<String> channelId;
 
     /**
      * 归因推广账号

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

@@ -318,8 +318,8 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		g.classify , -- 玩家注册游戏类型
                 		a.cp_id , -- CPID
                 		e.cp_name ,-- cp名
-                		c.pitcher_id as zx_pitcher_id, -- 投手ID
-                		d.zx_pitcher_name , -- 投手名
+                		IFNULL(c.pitcher_id, 0) as zx_pitcher_id, -- 投手ID
+                  		IFNULL(d.zx_pitcher_name, '自然量') as zx_pitcher_name, -- 投手名
                 		a.game_id as order_game_id, -- 玩家充值游戏ID
                 		f.game_name as order_game_name,-- 玩家充值游戏名
                 		f.classify as order_game_classify,-- 玩家充值游戏类型
@@ -397,8 +397,8 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		g.classify , -- 玩家注册游戏类型
                 		a.cp_id , -- CPID
                 		e.cp_name ,-- cp名
-                		c.pitcher_id as zx_pitcher_id, -- 投手ID
-                		d.zx_pitcher_name , -- 投手名
+                		IFNULL(c.pitcher_id, 0) as zx_pitcher_id, -- 投手ID
+                  		IFNULL(d.zx_pitcher_name, '自然量') as zx_pitcher_name, -- 投手名
                 		a.game_id as order_game_id, -- 玩家充值游戏ID
                 		f.game_name as order_game_name,-- 玩家充值游戏名
                 		f.classify as order_game_classify,-- 玩家充值游戏类型
@@ -477,8 +477,8 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		g.classify , -- 玩家注册游戏类型
                 		a.cp_id , -- CPID
                 		e.cp_name ,-- cp名
-                		c.pitcher_id as zx_pitcher_id, -- 投手ID
-                		d.zx_pitcher_name , -- 投手名
+                		IFNULL(c.pitcher_id, 0) as zx_pitcher_id, -- 投手ID
+                  		IFNULL(d.zx_pitcher_name, '自然量') as zx_pitcher_name, -- 投手名
                 		a.game_id as order_game_id, -- 玩家充值游戏ID
                 		f.game_name as order_game_name,-- 玩家充值游戏名
                 		f.classify as order_game_classify,-- 玩家充值游戏类型

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

@@ -125,7 +125,7 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
         }
         if (dto.getChannelId() != null) {
             //渠道id
-            cri.where().andEquals("agent_id", dto.getChannelId());
+            cri.where().andIn("agent_id", dto.getChannelId().toArray(String[]::new));
         }
         if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("account_id", dto.getAccountId());
@@ -251,7 +251,7 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
         }
         if (dto.getChannelId() != null) {
             //渠道ID
-            cri.where().andEquals("agent_id", dto.getChannelId());
+            cri.where().andIn("agent_id", dto.getChannelId().toArray(String[]::new));
         }
         if (StringUtils.isNotBlank(dto.getPitcherId())) {
             cri.where().andEquals("pitcher_id", dto.getPitcherId());
@@ -383,7 +383,7 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
         }
         if (dto.getChannelId() != null) {
             //渠道ID
-            cri.where().andEquals("agent_id", dto.getChannelId());
+            cri.where().andIn("agent_id", dto.getChannelId().toArray(String[]::new));
         }
         if (StringUtils.isNotBlank(dto.getPitcherId())) {
             cri.where().andEquals("pitcher_id", dto.getPitcherId());