From 9789da2aabf808c64ef58d92f9546c96f39287b0 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 12 Jul 2021 16:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php     | 4 ++--
 Application/Admin/Controller/TimingController.class.php       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

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') {