Merge remote-tracking branch 'origin/master'

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

@@ -157,7 +157,7 @@ public class AppAgentController extends BaseController {
         //团队投注赢
         vo.setTeamWin(BigDecimal.valueOf(appUserCountList.stream().mapToDouble(
                 e->{
-                    return e.getGameWinAmount() - (e.getGameBetting() - e.getGameLoseAmount());
+                    return e.getGameWinAmount();
                 }
         ).sum()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
         //团队投注输

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

@@ -225,7 +225,7 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
                         }).collect(Collectors.toList()));
                     }
                     //统计整条线用户数据
-                    List<AppUserCount> appUserCountList = appUserCountService.getAppUserCountNew(e.getUserId(), teamDto.getBeginTime(),teamDto.getEndTime());
+                    /*List<AppUserCount> appUserCountList = appUserCountService.getAppUserCountNew(e.getUserId(), teamDto.getBeginTime(),teamDto.getEndTime());
                     if(null != appUserCountList && appUserCountList.size() > 0) {
                         DecimalFormat df = new DecimalFormat("#.##");
                         //下注金额
@@ -262,7 +262,7 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
                         e.setRechargeCommission(0.00);
                         //充值赠送金额
                         e.setRechargeGive(0.00);
-                    }
+                    }*/
                 });
             }
         }

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

@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             IFNULL(sum(b.game_betting),0) as bettingAmount,
             IFNULL(sum(b.game_commission),0) as gameCommission,
             IFNULL(sum(b.live_commission),0) as liveCommission,
-            IFNULL(sum(b.game_win_amount - b.game_lose_amount),0) as gameAmount,
+            IFNULL(sum((b.game_win_amount - (b.game_betting - b.game_lose_amount)) - b.game_lose_amount + b.game_commission + b.recharge_give),0) as gameAmount,
             IFNULL(sum(b.recharge_amount),0) as rechargeAmount,
             IFNULL(sum(b.recharge_commission),0) as rechargeCommission,
             IFNULL(sum(b.recharge_give),0) as rechargeGive,