Merge remote-tracking branch 'origin/dev' into dev

Application/Home/Controller/DownloadController.class.php

@@ -2491,18 +2491,18 @@ class DownloadController extends BaseController {
      public function settlementExcelInfo($id,$map) {
          $xlsName = "结算明细";
          $xlsCell = array(
-             '游戏订单号',
+            '游戏订单号',
             '游戏',
-             '玩家账号',
+            '玩家账号',
             '推广员账号',
-             '订单总额',
+            '订单总额',
             '直充',
-             '内充',
-             '分成比例(直充)',
+            '内充',
+            '分成比例(直充)',
             '分成比例(内充)',
-             '收益',
-             '充值时间',
-             '订单状态',
+            '收益',
+            '充值时间',
+            '订单状态',
         );    
           $model = M('spend', 'tab_');
           $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,if(selle_ratio >= 0,selle_ratio,0) as selle_ratio,pay_time,selle_status,pay_status,withdraw_id')
@@ -2593,7 +2593,7 @@ class DownloadController extends BaseController {
                 $csvData["pay_amount_zhi"] = $list["pay_amount_zhi"];
                 $csvData["pay_amount_nei"] = $list["pay_amount_nei"];
                 $csvData["selle_ratio"] = $list["selle_ratio"];
-                $csvData["selle_ratio"] = $list["selle_ratio"];
+                $csvData["selle_ratio1"] = $list["selle_ratio"];
                 $csvData["income"] = $list["income"];
                 $csvData["pay_time"] = $list["pay_time"];
                 $csvData["selle_status"] = $list["selle_status"];
@@ -2613,7 +2613,7 @@ class DownloadController extends BaseController {
         $allData['pay_amount_zhi'] = $total['direct_pay_amount'];
         $allData['pay_amount_nei'] = $total['inner_pay_amount'];
         $allData['selle_ratio'] = '--';
-        $allData['selle_ratio'] = '--';
+        $allData['selle_ratio1'] = '--';
         $allData['income'] = $total['income'];
         $allData['pay_time'] = '--';
         $allData['selle_status'] = '--';