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

更新错误

Browse Source
This commit is contained in:
mkm 2023-12-26 15:44:07 +08:00
parent da986024b7
commit a11d58b0b8
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/common/repositories/system/merchant/FinancialRecordTransferRepository.php
View File

@ -287,8 +287,6 @@ class FinancialRecordTransferRepository extends BaseRepository
'count' => $income['count'] . '笔', 'count' => $income['count'] . '笔',
'data' => [ 'data' => [
['订单支付', $income['number_order'] . '元', $income['count_order'] . '笔'], ['订单支付', $income['number_order'] . '元', $income['count_order'] . '笔'],
['退回优惠券补贴', $income['number_coupon'] . '元', $income['count_coupon'] . '笔'],
['退回会员优惠券补贴', $income['number_svipcoupon'] . '元', $income['count_svipcoupon'] . '笔'],
] ]
]; ];
$data['bill'] = [ $data['bill'] = [
@ -305,8 +303,6 @@ class FinancialRecordTransferRepository extends BaseRepository
['应付商户金额', $expend['number_order'] . '元', $expend['count_order'] . '笔'], ['应付商户金额', $expend['number_order'] . '元', $expend['count_order'] . '笔'],
['佣金', $expend['number_brokerage'] . '元', $expend['count_brokerage'] . '笔'], ['佣金', $expend['number_brokerage'] . '元', $expend['count_brokerage'] . '笔'],
['返还手续费', $expend['number_charge'] . '元', $expend['count_charge'] . '笔'], ['返还手续费', $expend['number_charge'] . '元', $expend['count_charge'] . '笔'],
['优惠券补贴', $expend['number_coupon'] . '元', $expend['count_coupon'] . '笔'],
['会员优惠券补贴', $expend['number_svipcoupon'] . '元', $expend['count_svipcoupon'] . '笔'],
] ]
]; ];
$data['charge'] = [ $data['charge'] = [
@ -343,8 +339,6 @@ class FinancialRecordTransferRepository extends BaseRepository
'count' => $income['count'] . '笔', 'count' => $income['count'] . '笔',
'data' => [ 'data' => [
['订单支付', $income['number_order'] . '元', $income['count_order'] . '笔'], ['订单支付', $income['number_order'] . '元', $income['count_order'] . '笔'],
['优惠券补贴', $income['number_coupon'] . '元', $income['count_coupon'] . '笔'],
['会员优惠券补贴', $income['number_svipcoupon'] . '元', $income['count_svipcoupon'] . '笔'],
] ]
]; ];
$data['expend'] = [ $data['expend'] = [
@ -373,16 +367,6 @@ class FinancialRecordTransferRepository extends BaseRepository
$expend['number_refund'] . '元', $expend['number_refund'] . '元',
$expend['count_refund'] . '笔' $expend['count_refund'] . '笔'
], ],
[
'退还优惠券补贴',
$expend['number_coupon'] . '元',
$expend['count_coupon'] . '笔'
],
[
'退还会员优惠券补贴',
$expend['number_svipcoupon'] . '元',
$expend['count_svipcoupon'] . '笔'
],
] ]
]; ];
$data['charge'] = [ $data['charge'] = [
@ -442,8 +426,6 @@ class FinancialRecordTransferRepository extends BaseRepository
} else { } else {
$financialType = ['refund_platform_coupon']; $financialType = ['refund_platform_coupon'];
} }
[$data['count_coupon'], $data['number_coupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
if ($where['is_mer']) { if ($where['is_mer']) {
$financialType = ['order_svip_coupon']; $financialType = ['order_svip_coupon'];
} else { } else {
@ -452,7 +434,7 @@ class FinancialRecordTransferRepository extends BaseRepository
[$data['count_svipcoupon'], $data['number_svipcoupon']] = $this->dao->getDataByType($type, $where, $date, $financialType); [$data['count_svipcoupon'], $data['number_svipcoupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
$data['count'] = $data['count_order']; $data['count'] = $data['count_order'];
$data['number'] = bcadd($data['number_coupon'], $data['number_order'], 2); $data['number'] =$data['number_order'];
return $data; return $data;
} }
@ -540,7 +522,7 @@ class FinancialRecordTransferRepository extends BaseRepository
$data['number_brokerage']+=$data['number_commission']-$data['number_refund']; $data['number_brokerage']+=$data['number_commission']-$data['number_refund'];
$number = bcadd($data['number_brokerage'], $data['number_order'], 2); $number = bcadd($data['number_brokerage'], $data['number_order'], 2);
$number_1 = bcadd(bcadd($number, $data['number_coupon'], 2), $data['number_svipcoupon'], 2); $number_1 = bcadd($number, $data['number_svipcoupon'], 2);
$data['count'] = $data['count_brokerage'] + $data['count_order'] + $data['count_charge']; $data['count'] = $data['count_brokerage'] + $data['count_order'] + $data['count_charge'];
$data['number'] = bcadd($number_1, $data['number_charge'], 2); $data['number'] = bcadd($number_1, $data['number_charge'], 2);