diff --git a/app/common/repositories/system/merchant/FinancialRecordRepository.php b/app/common/repositories/system/merchant/FinancialRecordRepository.php index 443b4f01..4a6b9af3 100644 --- a/app/common/repositories/system/merchant/FinancialRecordRepository.php +++ b/app/common/repositories/system/merchant/FinancialRecordRepository.php @@ -208,6 +208,8 @@ class FinancialRecordRepository extends BaseRepository { //商户收入 $count = $this->dao->search($where)->where('financial_type','in',['order','mer_presell'])->sum('number'); + //保证金 + $auto_margin = $this->dao->search($where)->where('financial_type','auto_margin')->sum('number'); //平台优惠券 $coupon = $this->dao->search($where)->where('financial_type','in',['order_platform_coupon','order_svip_coupon'])->sum('number'); //商户余额 @@ -277,6 +279,11 @@ class FinancialRecordRepository extends BaseRepository 'count' => $merLockMoney, 'field' => '元', 'name' => '商户冻结金额' + ], [ + 'className' => 'el-icon-s-cooperation', + 'count' => $auto_margin, + 'field' => '元', + 'name' => '商户保证金金额' ], ]; return compact('stat'); @@ -322,7 +329,6 @@ class FinancialRecordRepository extends BaseRepository 'expend' => $expend , 'charge' => bcsub($income,$expend,2), ]; - }else{ if(!$ret = Cache::get($key)){ $income = ($this->countIncome($where['type'],$where,$item['time']))['number'] ; @@ -431,8 +437,10 @@ class FinancialRecordRepository extends BaseRepository 'data' => [ [ '平台手续费', - bcsub($expend['number_order_charge'],$expend['number_charge'],2) .'元', - $expend['count_charge']+$expend['count_order_charge'].'笔' + $expend['number_order_charge'] .'元', + $expend['count_order_charge'].'笔', + '退回'.$expend['number_order_charge'] .'元', + '退回'.$expend['count_charge'].'笔', ], [ '店铺保证金', @@ -587,12 +595,8 @@ class FinancialRecordRepository extends BaseRepository //退回收入 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'] + $data['count_refund_brokerage'] + $data['count_svipcoupon']+$data['count_auto_margin']; + $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($number_2,$number,3),$number_1,2); - if ($data['number_auto_margin'] > 0) { - $data['number'] = bcadd($data['number'],$data['number_auto_margin'],2); - } }else{ //平台的 // 退回 订单实际获得金额 @@ -614,7 +618,6 @@ class FinancialRecordRepository extends BaseRepository $data['count'] = $data['count_brokerage'] + $data['count_order'] + $data['count_charge']; $data['number'] = bcadd($number_1,$data['number_charge'],2); } - return $data; }