代理中心统计改为整条线

game-business/src/main/java/com/game/business/controller/AppAgentController.java

@@ -73,7 +73,7 @@ public class AppAgentController extends BaseController {
         Date beginDate = DateUtil.beginOfMonth(nowDate);
         Date endDate = DateUtil.endOfMonth(nowDate);
 
-        List<AppUserCount> appUserCountList = appUserCountService.getAppUserCount(userId,DateUtil.format(beginDate,formatP),DateUtil.format(endDate,formatP));
+        List<AppUserCount> appUserCountList = appUserCountService.getAppUserCountNew(userId,DateUtil.format(beginDate,formatP),DateUtil.format(endDate,formatP));
 
         if(null == appUserCountList){
             appUserCountList = new ArrayList<>();

game-business/src/main/java/com/game/business/mapper/AppUserCountMapper.java

@@ -2,6 +2,27 @@ package com.game.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.game.business.domain.AppUserCount;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 public interface AppUserCountMapper extends BaseMapper<AppUserCount> {
+
+    @Select(" <script>" +
+            "select a.* from app_user_count as a INNER JOIN" +
+            " (WITH RECURSIVE useragent AS" +
+            " (" +
+            " SELECT *" +
+            " FROM app_user_agent" +
+            " WHERE pid = #{pid}" +
+            " UNION ALL" +
+            " SELECT o.*" +
+            " FROM app_user_agent o" +
+            " JOIN useragent s ON o.pid = s.user_id" +
+            " )" +
+            " SELECT user_id FROM useragent ) as b on a.user_id = b.user_id where a.str_date between #{beginTime} and #{endTime}" +
+            " </script>")
+    public List<AppUserCount> selectTeamUserCount(@Param("pid") Long pid,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
 }

game-business/src/main/java/com/game/business/service/IAppUserCountService.java

@@ -11,6 +11,9 @@ public interface IAppUserCountService extends IService<AppUserCount> {
 
     public List<AppUserCount> getAppUserCount(long userId,String beginTime,String endTIme);
 
+
+    public List<AppUserCount> getAppUserCountNew(long userId,String beginTime,String endTIme);
+
     public void createAppUserCount(AppUserCount appUserCount);
 
     public void staticsUserCount(Long gameId,String dateTime,String gameDate);

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

@@ -57,6 +57,11 @@ public class AppUserCountServiceImpl extends ServiceImpl<AppUserCountMapper, App
         return appUserCountMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public List<AppUserCount> getAppUserCountNew(long userId, String beginTime, String endTIme) {
+        return appUserCountMapper.selectTeamUserCount(userId,beginTime,endTIme);
+    }
+
     @Override
 //    @Async
     @Transactional