diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index b4bfc840b..418007af1 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -1088,12 +1088,12 @@ class MarketPercentageController extends ThinkController if ($_REQUEST['export']) { $data = $data - ->order("pay_time DESC,company_profit DESC") + ->order("pay_time DESC,pay_amount DESC") ->select(); } else { $data = $data // ->page($p, $row) - ->order("pay_time DESC,company_profit DESC") + ->order("pay_time DESC,pay_amount DESC") ->select(); } diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index b4252f5d8..8965c17e5 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -1323,6 +1323,10 @@ class TimingController extends AdminController { $pay_time = date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01')); $map['pay_time'] = date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01')); } + + A("MarketPerformanceSet")->marketManagerSet($pay_time); + // $this->createMarketBonus($_REQUEST['time']); + // dump(date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01')));die(); if ($pay_time == 'all') {