From e8dc53409a2d124ee7d7b671e4361f12a7b3c30f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 8 Nov 2024 01:01:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(store):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=80=BB=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了订单查询条件中的 refund_status 筛选
- 优化了退款金额的计算逻辑，直接使用 $where 参数
- 删除了不必要的条件重置和额外变量声明
---
 app/store/logic/WorkbenchLogic.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index 0fee90bb9..cdfde4740 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -53,7 +53,7 @@ class WorkbenchLogic extends BaseLogic
         $endTime = $params['end_time'];
         $endTime = date('Y-m-d', strtotime($endTime) + 86400);
         $dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime));
-        $where = ['paid' => 1,'refund_status'=>0];
+        $where = ['paid' => 1];
         $userRechargeWhere = ['paid' => 1];
         $cashFinanceWhere = [];
         $storeFinanceWhere = ['financial_type'=>2,'financial_pm'=>1];
@@ -71,9 +71,7 @@ class WorkbenchLogic extends BaseLogic
         $orderLogic = new StoreOrderLogic();
         //订单总金额
         $pay_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $where);
-        unset($where['refund_status']);
-        $wheres=$where;
-        $refund_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $wheres,'refund_price');
+        $refund_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $where,'refund_price');
         $data['order_amount'] = bcsub($pay_price,$refund_price,2);
         //余额支付总金额
         $data['balance_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::BALANCE_PAY]));