From 4419f1539cfc612e93f0bd71d87d4dd0a7322e09 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 8 Feb 2021 14:51:51 +0800 Subject: [PATCH] =?UTF-8?q?2.10=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketPercentageController.class.php | 2 +- .../Factory/MarketPercentageFactory.class.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 54034f2f6..a9a59e025 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -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']]['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]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', ''); diff --git a/Application/Base/Factory/MarketPercentageFactory.class.php b/Application/Base/Factory/MarketPercentageFactory.class.php index bd07c0a41..fc6623d0f 100644 --- a/Application/Base/Factory/MarketPercentageFactory.class.php +++ b/Application/Base/Factory/MarketPercentageFactory.class.php @@ -39,13 +39,13 @@ class MarketPercentageFactory { if ($market_percentage['time'] == 1) { 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") { - $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") { - $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']; + } elseif($month=="07" || $month=="08" || $month=="09") { + $returnArr[$value['admin_id'].($yes)."-10"]['performance_commission'] += $value['wait_performance_commission']; } } elseif($market_percentage['time'] == 2) { @@ -63,13 +63,13 @@ class MarketPercentageFactory { if ($market_percentage['remain_time'] == 1) { 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") { - $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") { - $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") { - $returnArr[$value['admin_id'].($yes+1)."-01"]['achievement_bonus'] += + $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); }