Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

master
sunke 5 years ago
commit 04e53e2329

@ -1,85 +1,91 @@
<?php <?php
namespace Admin\Controller; namespace Admin\Controller;
use User\Api\UserApi as UserApi; use User\Api\UserApi as UserApi;
/** /**
* 后台首页控制器 * 后台首页控制器
* @author 麦当苗儿 <zuojiazi@vip.qq.com> * @author 麦当苗儿 <zuojiazi@vip.qq.com>
*/ */
class SpendController extends ThinkController { class SpendController extends ThinkController
{
const model_name = 'Spend'; const model_name = 'Spend';
public function lists(){
public function lists()
{
if (isset($_REQUEST['user_account'])) { if (isset($_REQUEST['user_account'])) {
$map['tab_spend.user_account']=array('like','%'.trim($_REQUEST['user_account']).'%'); $map['user_account'] = array('like', trim($_REQUEST['user_account']));
unset($_REQUEST['user_account']); unset($_REQUEST['user_account']);
} }
if (isset($_REQUEST['spend_ip'])) { if (isset($_REQUEST['spend_ip'])) {
$map['tab_spend.spend_ip']=array('like','%'.trim($_REQUEST['spend_ip']).'%'); $map['spend_ip'] = array('like', trim($_REQUEST['spend_ip']) . '%');
unset($_REQUEST['spend_ip']); unset($_REQUEST['spend_ip']);
} }
if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) { if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
$map['tab_spend.pay_time'] =array('BETWEEN',array(strtotime($_REQUEST['time-start']),strtotime($_REQUEST['time-end'])+24*60*60-1)); $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['time-start']), strtotime($_REQUEST['time-end']) + 24 * 60 * 60 - 1));
unset($_REQUEST['time-start']);unset($_REQUEST['time-end']); unset($_REQUEST['time-start']);
unset($_REQUEST['time-end']);
} elseif (isset($_REQUEST['time-start'])) { } elseif (isset($_REQUEST['time-start'])) {
$map['tab_spend.pay_time'] = ['GT',strtotime(I('time-start'))]; $map['pay_time'] = ['GT', strtotime(I('time-start'))];
unset($_REQUEST['time-start']); unset($_REQUEST['time-start']);
} elseif (isset($_REQUEST['time-end'])) { } elseif (isset($_REQUEST['time-end'])) {
$map['tab_spend.pay_time'] = ['LT',strtotime(I('time-end'))+86399]; $map['pay_time'] = ['LT', strtotime(I('time-end')) + 86399];
unset($_REQUEST['time-end']); unset($_REQUEST['time-end']);
} }
if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) { if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) {
$map['tab_spend.pay_time'] =array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1)); $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1));
unset($_REQUEST['start']);unset($_REQUEST['end']); unset($_REQUEST['start']);
unset($_REQUEST['end']);
} elseif (isset($_REQUEST['start'])) { } elseif (isset($_REQUEST['start'])) {
$map['tab_spend.pay_time'] = ['GT',strtotime(I('start'))]; $map['pay_time'] = ['GT', strtotime(I('start'))];
unset($_REQUEST['start']); unset($_REQUEST['start']);
} elseif (isset($_REQUEST['end'])) { } elseif (isset($_REQUEST['end'])) {
$map['tab_spend.pay_time'] = ['LT',strtotime(I('end'))+86399]; $map['pay_time'] = ['LT', strtotime(I('end')) + 86399];
unset($_REQUEST['end']); unset($_REQUEST['end']);
} }
if (isset($_REQUEST['game_name'])) { if (isset($_REQUEST['game_name'])) {
if ($_REQUEST['game_name'] == '全部') { if ($_REQUEST['game_name'] == '全部') {
unset($_REQUEST['game_name']); unset($_REQUEST['game_name']);
} else { } else {
$map['tab_spend.game_id']= ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; $map['game_id'] = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')];
unset($_REQUEST['game_name']); unset($_REQUEST['game_name']);
} }
} }
if (isset($_REQUEST['server_name'])) { if (isset($_REQUEST['server_name'])) {
$map['tab_spend.server_name']=$_REQUEST['server_name']; $map['server_name'] = $_REQUEST['server_name'];
unset($_REQUEST['server_name']); unset($_REQUEST['server_name']);
} }
if (isset($_REQUEST['pay_order_number'])) { if (isset($_REQUEST['pay_order_number'])) {
$map['tab_spend.pay_order_number']=array('like','%'.trim($_REQUEST['pay_order_number']).'%'); $map['pay_order_number'] = array('like', trim($_REQUEST['pay_order_number']) . '%');
unset($_REQUEST['pay_order_number']); unset($_REQUEST['pay_order_number']);
} }
if (isset($_REQUEST['pay_status'])) { if (isset($_REQUEST['pay_status'])) {
$map['tab_spend.pay_status']=$_REQUEST['pay_status']; $map['pay_status'] = $_REQUEST['pay_status'];
unset($_REQUEST['pay_status']); unset($_REQUEST['pay_status']);
} }
if (isset($_REQUEST['pay_way'])) { if (isset($_REQUEST['pay_way'])) {
if ($_REQUEST['pay_way'] == 2) { if ($_REQUEST['pay_way'] == 2) {
$map['tab_spend.pay_way']=['in','2,3,4']; $map['pay_way'] = ['in', '2,3,4'];
} else { } else {
$map['tab_spend.pay_way']=$_REQUEST['pay_way']; $map['pay_way'] = $_REQUEST['pay_way'];
} }
unset($_REQUEST['pay_way']); unset($_REQUEST['pay_way']);
} }
if (isset($_REQUEST['pay_game_status'])) { if (isset($_REQUEST['pay_game_status'])) {
$map['tab_spend.pay_game_status']=$_REQUEST['pay_game_status']; $map['pay_game_status'] = $_REQUEST['pay_game_status'];
unset($_REQUEST['pay_game_status']); unset($_REQUEST['pay_game_status']);
} }
if (isset($_REQUEST['promote_id'])) { if (isset($_REQUEST['promote_id'])) {
if ($_REQUEST['promote_id'] == 0) { $promoteId = intval($_REQUEST['promote_id']);
if ($promoteId == 0) {
$map['promote_id'] = 0; $map['promote_id'] = 0;
} else { } else {
$map['_complex'] = ['tp.chain'=>['like', "%/{$_REQUEST['promote_id']}/%"], 'tp.id'=>$_REQUEST['promote_id'], '_logic' => 'or']; $promoteMap['chain'] = ['like', "%/$promoteId/%"];
$promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
$promoteIds[] = $promoteId;
$map['promote_id'] = ['in', $promoteIds];
} }
$tab_promote_join = "left join tab_promote as tp on tp.id = tab_spend.promote_id";
//unset($_REQUEST['promote_id']);
} else {
$tab_promote_join = false;
} }
if ($_REQUEST['data_order'] != '') { if ($_REQUEST['data_order'] != '') {
@ -95,25 +101,19 @@ class SpendController extends ThinkController {
$map1 = $map; $map1 = $map;
$map1['pay_status'] = 1; $map1['pay_status'] = 1;
$total=null_to_0(D(self::model_name)->where($map1)->join($tab_promote_join)->sum('pay_amount')); $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
$ttotal=null_to_0(D(self::model_name)->where('pay_time'.total(1))->where(array('pay_status'=>1))->join($tab_promote_join)->sum('pay_amount')); $ttotal = null_to_0(D(self::model_name)->where('pay_time' . total(1))->where(array('pay_status' => 1))->sum('pay_amount'));
$ytotal=null_to_0(D(self::model_name)->where('pay_time'.total(5))->where(array('pay_status'=>1))->join($tab_promote_join)->sum('pay_amount')); $ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount'));
$this->assign('total', $total); $this->assign('total', $total);
$this->assign('ttotal', $ttotal); $this->assign('ttotal', $ttotal);
$this->assign('ytotal', $ytotal); $this->assign('ytotal', $ytotal);
$this->meta_title = $this->m_title = '游戏充值'; $this->meta_title = $this->m_title = '游戏充值';
$this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Spend/lists', 'status' => 1])->find()); $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Spend/lists', 'status' => 1])->find());
/*parent::lists(self::model_name,$_GET["p"],$map);*/
$data = D(self::model_name)->lists($_GET["p"], $map, $order); $data = D(self::model_name)->lists($_GET["p"], $map, $order);
$this->assign('list_data', $data['data']); $this->assign('list_data', $data['data']);
$this->assign('_page', $data['page']); $this->assign('_page', $data['page']);
$this->display(); $this->display();
} }

@ -710,29 +710,21 @@ protected function _after_select(&$result,$options){
*/ */
public function lists($p=1, $map=array(), $order, $field=true) public function lists($p=1, $map=array(), $order, $field=true)
{ {
$page = intval($p); $page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据 $page = $page ? $page : 1; //默认显示第一页数据
if(isset($_REQUEST['row'])) { if(isset($_REQUEST['row'])) {
$row = $_REQUEST['row']; $row = $_REQUEST['row'];
} else { } else {
$row = 10; $row = 10;
} }
$list = $this->field("tab_spend.*") $list = $this
->join("left join tab_promote as tp on tp.id = tab_spend.promote_id")
->where($map) ->where($map)
->page($page, $row) ->page($page, $row)
->order($order?$order:'tab_spend.pay_time desc') ->order($order?$order:'pay_time desc')
->select(); ->select();
$count = $this->where($map)->count();
$count = $this->where($map)->join("left join tab_promote as tp on tp.id = tab_spend.promote_id")->count();
$data['data'] = $list; $data['data'] = $list;
$page = set_pagination($count,$row); $page = set_pagination($count,$row);
if($page) { if($page) {
$data['page']=$page; $data['page']=$page;
} }

Loading…
Cancel
Save