|
|
@ -706,7 +706,7 @@ class MarketPercentageController extends ThinkController
|
|
|
|
foreach ($all_data as $key => $value) {
|
|
|
|
foreach ($all_data as $key => $value) {
|
|
|
|
|
|
|
|
|
|
|
|
$wait_amount[$value['admin_id'].$value['pay_time'].'performance_commission'] = $value['wait_performance_commission'];
|
|
|
|
$wait_amount[$value['admin_id'].$value['pay_time'].'performance_commission'] = $value['wait_performance_commission'];
|
|
|
|
$wait_amount[$value['admin_id'].$value['pay_time'].'achievement_bonus'] = $value['wait_achievement_commission'];
|
|
|
|
$wait_amount[$value['admin_id'].$value['pay_time'].'achievement_bonus'] = $value['wait_achievement_commission'] * ($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -784,7 +784,7 @@ class MarketPercentageController extends ThinkController
|
|
|
|
$data[$key]['achievement_bonus'] = number_format($data[$key]['achievement_bonus'] * ($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
|
|
|
|
$data[$key]['achievement_bonus'] = number_format($data[$key]['achievement_bonus'] * ($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
|
|
|
|
|
|
|
|
|
|
|
|
$data[$key]['commission'] = number_format($data[$key]['performance_commission'] + $data[$key]['achievement_bonus'], 2, '.', '');
|
|
|
|
$data[$key]['commission'] = number_format($data[$key]['performance_commission'] + $data[$key]['achievement_bonus'], 2, '.', '');
|
|
|
|
$data[$key]['wait_commission'] = substr(number_format($value['wait_performance_commission'] + $value['wait_achievement_commission']*($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 4, '.', ''),0,-2);
|
|
|
|
$data[$key]['wait_commission'] = number_format($value['wait_performance_commission'] + $value['wait_achievement_commission']*($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
|
|
|
|
$data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission'];
|
|
|
|
$data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission'];
|
|
|
|
// dump($data[$key]['commission']);
|
|
|
|
// dump($data[$key]['commission']);
|
|
|
|
|
|
|
|
|
|
|
|