|
@@ -97,7 +97,7 @@ class AgentReportService
|
|
|
COALESCE(SUM(CASE WHEN change_type IN ('比比返','笔笔返','返水','回水') AND amount > 0 THEN amount ELSE 0 END), 0) AS rebate_amount
|
|
COALESCE(SUM(CASE WHEN change_type IN ('比比返','笔笔返','返水','回水') AND amount > 0 THEN amount ELSE 0 END), 0) AS rebate_amount
|
|
|
SQL)->first();
|
|
SQL)->first();
|
|
|
|
|
|
|
|
- $bet = $this->betSummary($memberIds, $start, $end);
|
|
|
|
|
|
|
+ $bet = $this->betSummary($members, $memberIds, $start, $end);
|
|
|
$companyProfit = $this->companyProfit(
|
|
$companyProfit = $this->companyProfit(
|
|
|
(string) $depositAmount,
|
|
(string) $depositAmount,
|
|
|
(string) $withdrawAmount,
|
|
(string) $withdrawAmount,
|
|
@@ -250,7 +250,7 @@ class AgentReportService
|
|
|
return compact('total', 'page', 'limit', 'list');
|
|
return compact('total', 'page', 'limit', 'list');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private function betSummary($memberIds, Carbon $start, Carbon $end): array
|
|
|
|
|
|
|
+ private function betSummary($members, $memberIds, Carbon $start, Carbon $end): array
|
|
|
{
|
|
{
|
|
|
$total = ['bet_count' => 0, 'bet_amount' => '0.0000', 'valid_bet_amount' => '0.0000', 'win_loss' => '0.0000'];
|
|
$total = ['bet_count' => 0, 'bet_amount' => '0.0000', 'valid_bet_amount' => '0.0000', 'win_loss' => '0.0000'];
|
|
|
$sources = [];
|
|
$sources = [];
|