elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '2.10号功能提交' (#171) from feature/add_item into release

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/171
master
郑永星 4 years ago
parent 3c760984ab 4419f1539c
commit f078bfd8b6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
Application/Admin/Controller/MarketPercentageController.class.php
Unescape Escape View File

@ -833,7 +833,7 @@ class MarketPercentageController extends ThinkController
// dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']); // dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']);
// dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus']); // dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus']);
$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'] += $this->returnWaitMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']+$this->returnWaitMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus'];
$data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'], 2, '.', ''); $data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'], 2, '.', '');
$data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', ''); $data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', '');

16
Application/Base/Factory/MarketPercentageFactory.class.php
Unescape Escape View File

@ -39,13 +39,13 @@ class MarketPercentageFactory {
if ($market_percentage['time'] == 1) { if ($market_percentage['time'] == 1) {
if ($month=="01" || $month=="02" || $month=="03") { if ($month=="01" || $month=="02" || $month=="03") {
$returnArr[$value['admin_id'].$yes."-07"]['performance_commission'] += $value['wait_performance_commission']; $returnArr[$value['admin_id'].$yes."-04"]['performance_commission'] += $value['wait_performance_commission'];
} elseif ($month=="04" || $month=="05" || $month=="06") { } elseif ($month=="04" || $month=="05" || $month=="06") {
$returnArr[$value['admin_id'].$yes."-10"]['performance_commission'] += $value['wait_performance_commission']; $returnArr[$value['admin_id'].$yes."-07"]['performance_commission'] += $value['wait_performance_commission'];
} elseif($month=="10" || $month=="11" || $month=="12") { } elseif($month=="10" || $month=="11" || $month=="12") {
$returnArr[$value['admin_id'].($yes+1)."-04"]['performance_commission'] += $value['wait_performance_commission'];
} elseif($month=="07" || $month=="08" || $month=="09") {
$returnArr[$value['admin_id'].($yes+1)."-01"]['performance_commission'] += $value['wait_performance_commission']; $returnArr[$value['admin_id'].($yes+1)."-01"]['performance_commission'] += $value['wait_performance_commission'];
} elseif($month=="07" || $month=="08" || $month=="09") {
$returnArr[$value['admin_id'].($yes)."-10"]['performance_commission'] += $value['wait_performance_commission'];
} }
} elseif($market_percentage['time'] == 2) { } elseif($market_percentage['time'] == 2) {
@ -63,13 +63,13 @@ class MarketPercentageFactory {
if ($market_percentage['remain_time'] == 1) { if ($market_percentage['remain_time'] == 1) {
if ($month=="01" || $month=="02" || $month=="03") { if ($month=="01" || $month=="02" || $month=="03") {
$returnArr[$value['admin_id'].$yes."-07"]['achievement_bonus'] += $value['wait_achievement_commission'] * ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1); $returnArr[$value['admin_id'].$yes."-04"]['achievement_bonus'] += $value['wait_achievement_commission'] * ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1);
} elseif ($month=="04" || $month=="05" || $month=="06") { } elseif ($month=="04" || $month=="05" || $month=="06") {
$returnArr[$value['admin_id'].$yes."-10"]['achievement_bonus'] += $value['wait_achievement_commission'] * ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1); $returnArr[$value['admin_id'].$yes."-07"]['achievement_bonus'] += $value['wait_achievement_commission'] * ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1);
} elseif($month=="10" || $month=="11" || $month=="12") { } elseif($month=="10" || $month=="11" || $month=="12") {
$returnArr[$value['admin_id'].($yes+1)."-04"]['achievement_bonus'] += $value['wait_achievement_commission'] * ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1); $returnArr[$value['admin_id'].($yes+1)."-01"]['achievement_bonus'] += $value['wait_achievement_commission'] * ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1);
} elseif($month=="07" || $month=="08" || $month=="09") { } elseif($month=="07" || $month=="08" || $month=="09") {
$returnArr[$value['admin_id'].($yes+1)."-01"]['achievement_bonus'] += $returnArr[$value['admin_id'].($yes)."-10"]['achievement_bonus'] +=
$value['wait_achievement_commission'] * $value['wait_achievement_commission'] *
($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1); ($this->coefficients[$value['pay_time']][$value['admin_id']] ? $this->coefficients[$value['pay_time']][$value['admin_id']] : 1);
} }

Write Preview
Loading…
Cancel
Save