diff --git a/src/Services/Tg/ReportUser.php b/src/Services/Tg/ReportUser.php index f7dc7197..b28a4d08 100755 --- a/src/Services/Tg/ReportUser.php +++ b/src/Services/Tg/ReportUser.php @@ -74,11 +74,19 @@ final class ReportUser $iTotalRegCount = 0; $iTotalPayCount = 0; $iTotalMoneyCount = 0; + $iTotalPayCountOld = 0; + $iTotalPayCountNew = 0; + $iTotalMoneyCountOld = 0; + $iTotalMoneyCountNew = 0; foreach ($aData as $row) { $iTotalFromCount += $row['count_from'] ?? 0; $iTotalRegCount += $row['count_reg'] ?? 0; $iTotalPayCount += $row['count_pay'] ?? 0; + $iTotalPayCountOld += $row['count_pay_old'] ?? 0; + $iTotalPayCountNew += $row['count_pay_new'] ?? 0; $iTotalMoneyCount += $row['count_money'] ?? 0; + $iTotalMoneyCountOld += $row['count_money_old'] ?? 0; + $iTotalMoneyCountNew += $row['count_money_new'] ?? 0; } $iRegFromRate = 0; @@ -87,16 +95,16 @@ final class ReportUser $iRegFromRate = (int) (($iTotalRegCount / $iTotalFromCount) * 100); } if (!empty($iTotalPayCount) && !empty($iTotalRegCount)) { - $iPayRagRate = (int) (($iTotalPayCount / $iTotalRegCount) * 100); + $iPayRagRate = (int) (($iTotalPayCountNew / $iTotalRegCount) * 100); } $sStr = "🎹🎹🎹🎹🎹🎹\n\n"; $sStr .= "*总访问:".$iTotalFromCount."\n"; $sStr .= "*总注册:".$iTotalRegCount."\n"; - $sStr .= "*总支付:".$iTotalPayCount."\n"; - $sStr .= "*总金额:".$iTotalMoneyCount."\n"; + $sStr .= "*总支付:".$iTotalPayCount."【新".$iTotalPayCountNew."旧".$iTotalPayCountOld."】\n"; + $sStr .= "*总金额:".$iTotalMoneyCount."【新".$iTotalMoneyCountNew."旧".$iTotalMoneyCountOld."】\n"; $sStr .= "*访问注册比".$iRegFromRate."%\n"; - $sStr .= "*注册付款比".$iPayRagRate."%\n"; + $sStr .= "*注册付款比(新)".$iPayRagRate."%\n"; $iFromRate = 0; $iRegRate = 0;