From 573ff9dc9d718c60ae6676efebd298c34bc05bb0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 8 Nov 2024 00:53:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(store):=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改了退款金额统计的查询条件，去除了 refund_status 筛选
- 添加了保留两位小数的精度设置
---
 app/store/logic/WorkbenchLogic.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index 7fe42e59..0fee90bb 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -71,8 +71,10 @@ class WorkbenchLogic extends BaseLogic
         $orderLogic = new StoreOrderLogic();
         //订单总金额
         $pay_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $where);
-        $refund_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $where,'refund_price');
-        $data['order_amount'] = bcsub($pay_price,$refund_price);
+        unset($where['refund_status']);
+        $wheres=$where;
+        $refund_price=$orderLogic->storeOrderSumByDate($startTime, $endTime, $wheres,'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]));
         //微信条码支付总金额