Merge pull request 'fix(workbench): 修复今日/昨日/最近七天订单金额未扣除退款金额的问题' (#313) from dev into main

Reviewed-on: #313
This commit is contained in:
mkm 2024-11-08 00:34:22 +08:00
commit aa91831a27

View File

@ -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]));
//微信条码支付总金额