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

修改

Application/Home/Controller/DownloadController.class.php

@@ -3847,7 +3847,11 @@ public function iosDetailExcelInfo($id,$map) {
             '收益',
             '充值时间',
             '订单状态',
-        );    
+        );
+
+        $spendRepository = new SpendRepository();
+        $map = $spendRepository->withIsCheck($map);
+
           $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')
             ->where($map)
@@ -4001,6 +4005,10 @@ public function iosDetailExcelInfo($id,$map) {
             $endTime = strtotime($initEndTime);
             $endTime = $endTime + 3600 * 24;
          }
+
+         $spendRepository = new SpendRepository();
+         $map = $spendRepository->withIsCheck($map);
+
          $model = M('spend', 'tab_');
          $dayList = $this->getDayList($begTime, $endTime);
            $data = $model->field('FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,