From 02835aab30f026cd8c22cbef4d48b3eeabcd25a8 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 3 Aug 2024 00:07:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(TradeStatisticLogic):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/admin/logic/statistic/TradeStatisticLogic.php b/app/admin/logic/statistic/TradeStatisticLogic.php
index e9fc6a7b..456a0d25 100644
--- a/app/admin/logic/statistic/TradeStatisticLogic.php
+++ b/app/admin/logic/statistic/TradeStatisticLogic.php
@@ -754,12 +754,12 @@ class TradeStatisticLogic extends BaseLogic
         // }
         switch ($selectType) {
             case "sum":
-                $totalMoney = $storeOrder->where('pay_type', 17)->when(isset($where['timeKey']), function ($query) use ($where) {
+                $totalMoney = $storeOrder->where(['pay_type'=>17,'paid'=>1,'refund_status',0])->when(isset($where['timeKey']), function ($query) use ($where) {
                     $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
                 })->sum($offlineSumField);
                 break;
             case "group":
-                $totalMoney = $storeOrder->getCurveData(['pay_type' => 17], $where, 'sum(pay_price)', $group);
+                $totalMoney = $storeOrder->getCurveData(['pay_type'=>17,'paid'=>1,'refund_status',0], $where, 'sum(pay_price)', $group);
                 break;
             default:
                 throw new \Exception('getOfflineTotalMoney:selectType参数错误');