From 2a95eb8e1f2b8debf14e49e169cecf8bc6915d00 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 22 Jun 2024 11:19:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=BA=86=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=94=AF=E4=BB=98=E8=AE=A1=E7=AE=97=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E7=BA=BF=E4=B8=8B=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E5=92=8C=E6=80=BB=E4=BA=A4=E6=98=93=E9=A2=9D=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/statistic/TradeStatisticLogic.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php
index 40e1fd4a1..9ffded419 100644
--- a/app/admin/logic/statistic/TradeStatisticLogic.php
+++ b/app/admin/logic/statistic/TradeStatisticLogic.php
@@ -296,7 +296,6 @@ class TradeStatisticLogic extends BaseLogic
         $outYeOrderChain = countRate($outYeOrderMoney, $lastOutYeOrderMoney);
         //余额支付
         $outYeMoney = $outYeOrderMoney;
-        $lastOutYeMoney = $lastOutYeOrderMoney;
         $outYeCurve = $this->totalArrData([$outYeOrderCurve, 0]);
         $outYeChain = countRate($outYeOrderChain, 0);
         $topData[7] = [
@@ -454,9 +453,10 @@ class TradeStatisticLogic extends BaseLogic
         //购买会员收入
         $inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum);
         //线下收款收入
-        $inOfflineMoney = $this->getOfflineTotalMoney($where, $selectType, "", $isNum);
+        // $inOfflineMoney = $this->getOfflineTotalMoney($where, $selectType, "", $isNum);
         //总交易额
-        $inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), bcadd($inMemberMoney, $inOfflineMoney, 2), 2);/* - $outExtractUserMoney*/
+        // $inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), bcadd($inMemberMoney, $inOfflineMoney, 2), 2);/* - $outExtractUserMoney*/
+        $inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), $inMemberMoney, 2);/* - $outExtractUserMoney*/
         return $inTotalMoney;
     }