Merge branch 'hotfix/market_percentage' of wmtx/platform into master

平台币导出bug修正

Application/Admin/Controller/ExportController.class.php

@@ -1127,6 +1127,12 @@ class ExportController extends Controller
                     }
                     unset($_REQUEST['pay_way']);
                 }
+
+                if ($_REQUEST['merchant_id']) {
+                    $map['merchant_id'] = $_REQUEST['merchant_id'];
+                    unset($_REQUEST['merchant_id']);
+                }
+
                 if (isset($_REQUEST['pay_game_status'])) {
                     $map['pay_game_status'] = $_REQUEST['pay_game_status'];
                     unset($_REQUEST['pay_game_status']);
@@ -1353,6 +1359,10 @@ class ExportController extends Controller
                     $map['pay_status'] = $_REQUEST['pay_status'];
                     unset($_REQUEST['pay_status']);
                 }
+                if ($_REQUEST['merchant_id']) {
+                    $map['merchant_id'] = $_REQUEST['merchant_id'];
+                    unset($_REQUEST['merchant_id']);
+                }
                 $map1 = $map;
                 $map1['pay_status'] = 1;
 
@@ -2394,6 +2404,10 @@ class ExportController extends Controller
                         $map['pay_status'] = $_REQUEST['pay_status'];
                         unset($_REQUEST['pay_status']);
                     }
+                    if ($_REQUEST['merchant_id']) {
+                        $map['merchant_id'] = $_REQUEST['merchant_id'];
+                        unset($_REQUEST['merchant_id']);
+                    }
                     $map1 = $map;
                     $map1['pay_status'] = 1;
 
@@ -2497,6 +2511,10 @@ class ExportController extends Controller
                         $timeend = strtotime($params['timeend'])+86399;
                         $map['t.pay_time'] = array("ELT",$timeend);
                     }
+                    if ($_REQUEST['merchant_id']) {
+                        $map['merchant_id'] = $_REQUEST['merchant_id'];
+                        unset($_REQUEST['merchant_id']);
+                    }
     
     
                     $orderData =M('test_order t', 'tab_')