From f3196d4bac90b0a366dd257dc504a236a551a27b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 1 Jul 2024 15:06:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=92=8C=E5=B7=A5=E7=89=8C=E9=80=BB=E8=BE=91=E4=BB=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php | 2 +-
 app/store/logic/WorkbenchLogic.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 7758fe67c..32c02418b 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -172,7 +172,7 @@ class UserLogic extends BaseLogic
         $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']);
         $user->sex = $user->getData('sex');
         $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number');
-        $user['user_ship_name']=$user->user_ship>0?UserShip::where('id',$user->user_ship)->value('title'):"";
+        $user['user_ship_name']=$user->user_ship>0?UserShip::where('id',$user->user_ship)->value('title'):"一般用户";
         return $user->toArray();
     }
 
diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index e80449753..0120bbc53 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -628,7 +628,6 @@ class WorkbenchLogic extends BaseLogic
 
         //总的营业额的统计 总的利润的统计 总的成本合集的统计  总的加到保证金的
         $all =  StoreOrder::where(['paid' => YesNoEnum::YES, 'store_id' => $params['store_id']]);
-
         $deposit_all = StoreFinanceFlow::where(['store_id' => $params['store_id'], 'status' => YesNoEnum::YES])
             ->sum('number');
 
@@ -732,7 +731,7 @@ class WorkbenchLogic extends BaseLogic
     {
         $endTime = date('Y-m-d', strtotime($startTime) + 86400);
         //当日营业额的统计 当日利润的统计 当日成本合集的统计  当日加到保证金的  当日的现金收银
-        $today =  StoreOrder::where(['paid' => YesNoEnum::YES, 'store_id' => $store_id]);
+        $today =  StoreOrder::where(['paid' => YesNoEnum::YES, 'store_id' => $store_id,'refund_status'=>0]);
         $turnover_today = $today
             ->whereBetweenTime('create_time', $startTime, $endTime)
             ->sum('pay_price');