增加默认数据

game-business/src/main/java/com/game/business/service/impl/AppUserAgentServiceImpl.java

@@ -4,15 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.rmi.ServerException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.game.business.domain.AppGame;
 import com.game.business.domain.AppGameCommission;
 import com.game.business.domain.AppUser;
 import com.game.business.dto.AppAgentEditDto;
 import com.game.business.dto.AppAgentTeamDto;
 import com.game.business.service.IAppGameCommissionService;
+import com.game.business.service.IAppGameService;
 import com.game.business.service.IAppUserService;
 import com.game.business.vo.AppAgentTeamVo;
 import com.game.common.core.domain.HttpRet;
@@ -49,6 +52,9 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
     @Autowired
     private IAppGameCommissionService gameCommissionService;
 
+    @Autowired
+    private IAppGameService appGameService;
+
     /**
      * 查询用户代理表
      *
@@ -185,12 +191,23 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
             List<Long> ids = list.stream().map(e->{return e.getUserId();}).collect(Collectors.toList());
             //查询游戏分红比例
             List<AppGameCommission> gameCommissionList = gameCommissionService.getByIds(ids);
+            List<AppGame> gameList = appGameService.selectAppGameList(new AppGame());
             if(null != gameCommissionList && gameCommissionList.size() > 0){
                 Map<String,List<AppGameCommission>> map = gameCommissionList.stream().
                         collect(Collectors.groupingBy(j->String.valueOf(j.getUserId())));
                 list.forEach(e->{
                     if(null != map.get(String.valueOf(e.getUserId()))){
                         e.setGameCommissionList(map.get(String.valueOf(e.getUserId())));
+                    }else if(null != gameList && gameList.size() > 0){
+                        e.setGameCommissionList(gameList.stream().map(j->{
+                            AppGameCommission gameCommission = new AppGameCommission();
+                            gameCommission.setUserId(e.getUserId());
+                            gameCommission.setGameId(j.getId());
+                            gameCommission.setGameName(j.getName());
+                            gameCommission.setPid(e.getPid());
+                            gameCommission.setGameRate(0L);
+                            return gameCommission;
+                        }).collect(Collectors.toList()));
                     }
                 });
             }

game-business/src/main/java/com/game/business/vo/AppAgentTeamVo.java

@@ -19,6 +19,9 @@ public class AppAgentTeamVo {
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
+    @ApiModelProperty(value = "上级id")
+    private Long pid;
+
     @ApiModelProperty(value = "昵称")
     private String nickName;
 

game-business/src/main/resources/mapper/business/AppUserAgentMapper.xml

@@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             a.user_id as userId,
             c.nickname as nickName,
+            a.pid as pid,
             (select sum(betting_amount) from app_game_betting as b where b.user_id = a.user_id) as bettingAmount,
             (select sum(d.live_commission + d.game_commission) from app_user_count as d where d.user_id = a.user_id) as commission,
             (select sum(e.game_win_amount - e.game_lose_amount) from app_user_count as e where e.user_id = a.user_id) as gameAmount,