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

修改账单统计的错误

Browse Source
This commit is contained in:
luofei 2023-06-05 16:33:11 +08:00
parent ea3d5f95f0
commit 302300b28e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/common/repositories/system/merchant/FinancialRecordRepository.php
View File

@ -439,7 +439,7 @@ class FinancialRecordRepository extends BaseRepository
'data' => [
[
'平台手续费',
bcsub($expend['number_order_charge'], $expend['number_charge']). '元',
bcsub($expend['number_order_charge'], $expend['number_charge'], 2). '元',
bcsub($expend['count_order_charge'], $expend['count_charge']). '笔',
],
[
@ -633,7 +633,7 @@ class FinancialRecordRepository extends BaseRepository
//商户保证金退回
$financialType = ['auto_margin_refund'];
[$data['count_auto_margin_refund'], $data['number_auto_margin_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType);
$number3 = bcsub($data['number_auto_margin'], $data['number_auto_margin_refund']);
$number3 = bcsub($data['number_auto_margin'], $data['number_auto_margin_refund'], 2);
if ($number3>0){
$data['count_auto_margin'] = bcsub($data['count_auto_margin'], $data['count_auto_margin_refund']);
$data['number_auto_margin'] = $number3;
@ -657,14 +657,14 @@ class FinancialRecordRepository extends BaseRepository
// $data['number_brokerage']+=$data['number_commission2']-$data['number_commission'];
// }
//佣金 brokerage_one,brokerage_two - 退回佣金 refund_brokerage_two,refund_brokerage_one ）
$number = bcsub($data['number_brokerage'], $data['number_refund_brokerage'], 3);
$number = bcsub($data['number_brokerage'], $data['number_refund_brokerage'], 2);
//平台手续费 =（ order_charge + 预售手续费 presell_charge - 平台退给商户的手续费 refund_charge ）
$number_1 = bcsub($data['number_order_charge'], $data['number_charge'], 3);
$number_1 = bcsub($data['number_order_charge'], $data['number_charge'], 2);
//退回收入 refund_order + 退回佣金
$number_2 = bcadd(bcadd($data['number_refund'], $data['number_coupon'], 2), $data['number_svipcoupon'], 2);
$data['count'] = $data['count_brokerage'] + $data['count_refund'] + $data['count_order_charge'] + $data['count_refund_brokerage'] + $data['count_svipcoupon'] + $data['count_auto_margin'];
$data['number'] = bcadd(bcadd($number3,bcadd($number_2, $number, 3),3), $number_1, 2);
$data['number'] = bcadd(bcadd($number3,bcadd($number_2, $number, 2),2), $number_1, 2);
} else { //平台的
// 退回 订单实际获得金额