mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(store): 修复订单总金额计算逻辑' (#316) from dev into main

Browse Source 
Reviewed-on: #316
This commit is contained in:
mkm 2024-11-08 01:02:09 +08:00
commit 11751fade5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/store/logic/WorkbenchLogic.php
View File

@ -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]));