|
|
|
@ -1305,7 +1305,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
$payStatus = intval(I('pay_status'));
|
|
|
|
|
|
|
|
|
|
if (in_array($payStatus, array_keys(self::$payStatus))) {
|
|
|
|
|
$map['tab_spend.pay_status'] = $payStatus;
|
|
|
|
|
$map['tab_spend.pay_status'] = $payStatus + 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$conditions = json_encode($map,TRUE);
|
|
|
|
@ -1786,7 +1786,6 @@ class DownloadController extends BaseController {
|
|
|
|
|
$map[$key] = $value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// var_dump($dataname);die();
|
|
|
|
|
switch ($dataname) {
|
|
|
|
|
case "注册明细数据":
|
|
|
|
|
$this->registerExcelInfo($id,$map); //注册明细
|
|
|
|
@ -3300,6 +3299,9 @@ class DownloadController extends BaseController {
|
|
|
|
|
'付款时间',
|
|
|
|
|
);
|
|
|
|
|
$model = M('spend','tab_');
|
|
|
|
|
if(!empty($map['tab_spend.pay_status'])) {
|
|
|
|
|
$map['tab_spend.pay_status'] = $map['tab_spend.pay_status'] -2 ;
|
|
|
|
|
}
|
|
|
|
|
$data1 = $model
|
|
|
|
|
->field('tab_spend.id')
|
|
|
|
|
->join('tab_game on tab_spend.game_id = tab_game.id')
|
|
|
|
@ -3307,7 +3309,6 @@ class DownloadController extends BaseController {
|
|
|
|
|
->where($map)
|
|
|
|
|
->order('tab_spend.id desc')
|
|
|
|
|
->select();
|
|
|
|
|
|
|
|
|
|
$csvFileName = $xlsName.'.csv';
|
|
|
|
|
//设置好告诉浏览器要下载excel文件的headers
|
|
|
|
|
header('Content-Description: File Transfer');
|
|
|
|
@ -3354,7 +3355,6 @@ class DownloadController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
foreach ($data as $key1 => $value1) {
|
|
|
|
|
$value1['pay_way'] = $this->payWay[$value1['pay_way']];
|
|
|
|
|
$value1['pay_time'] = date('Y-m-d H:i:s',$value1['pay_time']);
|
|
|
|
|
$value1['p_p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')';
|
|
|
|
|
$value1['p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')';
|
|
|
|
|
$value1['proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')';
|
|
|
|
|