From 97e427dfe2987abdee1cc6bf12e438a4dddbb2b9 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 7 Jun 2023 14:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=BB=9F=E8=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/model/user/UserRecharge.php                  | 10 ++++++++++
 .../app/services/statistic/TradeStatisticServices.php  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/model/user/UserRecharge.php b/crmeb/app/model/user/UserRecharge.php
index af500cb9c..0c123307c 100644
--- a/crmeb/app/model/user/UserRecharge.php
+++ b/crmeb/app/model/user/UserRecharge.php
@@ -87,6 +87,16 @@ class UserRecharge extends BaseModel
         $query->where('recharge_type', $value);
     }
 
+    /**
+     * 不等于充值类型
+     * @param Model $query
+     * @param $value
+     */
+    public function searchNoRechargeTypeAttr($query, $value)
+    {
+        $query->where('recharge_type', '<>', $value);
+    }
+
     /**退款金额
      * @param $query
      * @param $value
diff --git a/crmeb/app/services/statistic/TradeStatisticServices.php b/crmeb/app/services/statistic/TradeStatisticServices.php
index 396b0bc79..d06692e8c 100644
--- a/crmeb/app/services/statistic/TradeStatisticServices.php
+++ b/crmeb/app/services/statistic/TradeStatisticServices.php
@@ -663,12 +663,12 @@ class TradeStatisticServices extends BaseServices
      */
     public function getRechargeTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false)
     {
-        /** 用户充值金额 */
         /** @var UserRechargeServices $userRechageService */
         $userRechageService = app()->make(UserRechargeServices::class);
         $rechargeSumField = "price";
         $whereInRecharge['paid'] = 1;
         $whereInRecharge['refund_price'] = '0.00';
+        $whereInRecharge['no_recharge_type'] = 'system';
         $whereInRecharge['timeKey'] = $this->TimeConvert($where['time'], $isNum);
         $whereInRecharge['store_id'] = 0;
         $totalMoney = $userRechageService->getRechargeMoneyByWhere($whereInRecharge, $rechargeSumField, $selectType, $group);