From fd1cf9292f1d181006b1f4011f98b9c1a564ad0b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 8 Nov 2024 00:33:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(workbench):=20=E4=BF=AE=E5=A4=8D=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5/=E6=98=A8=E6=97=A5/=E6=9C=80=E8=BF=91=E4=B8=83?=
 =?UTF-8?q?=E5=A4=A9=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E6=9C=AA=E6=89=A3?=
 =?UTF-8?q?=E9=99=A4=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在计算订单总金额时，增加了对退款金额的处理
- 使用 bcsub 函数精确计算支付金额和退款金额的差值
- 优化了数据计算逻辑，提高了报表数据的准确性
---
 app/store/logic/WorkbenchLogic.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index bcb3fffb..7fe42e59 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -70,7 +70,9 @@ class WorkbenchLogic extends BaseLogic
         }
         $orderLogic = new StoreOrderLogic();
         //订单总金额
-        $data['order_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, $where);
+        $pay_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $where);
+        $refund_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $where,'refund_price');
+        $data['order_amount'] = bcsub($pay_price,$refund_price);
         //余额支付总金额
         $data['balance_amount'] = $orderLogic->storeOrderSumByDate($startTime, $endTime, array_merge($where, ['pay_type' => PayEnum::BALANCE_PAY]));
         //微信条码支付总金额