Merge pull request '市场业绩bug修复' (#227) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
master
郑永星 4 years ago
commit d24d98d11d

@ -839,8 +839,12 @@ class MarketPercentageController extends ThinkController
// $data[$key]['wait_commission'] += $this->returnWaitMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']+$this->returnWaitMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus'];
$data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', '');
$data[$key]['wait_achievement_commission'] = $data[$key]['wait_commission'] - $data[$key]['wait_performance_commission'];
$data[$key]['achievement_bonus'] = $achievement_bonus;
$sum['performance_revenue'] += $data[$key]['performance_revenue'];

Loading…
Cancel
Save