|
|
|
@ -282,6 +282,7 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
$map['s.market_admin_id'] = $adminId;
|
|
|
|
|
}
|
|
|
|
|
$map['s.pay_status']=1;
|
|
|
|
|
$map['s.is_check']=1;
|
|
|
|
|
$field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
|
|
|
|
|
SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
|
|
|
|
|
SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count,
|
|
|
|
@ -511,6 +512,7 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
$map['s.market_admin_id'] = $adminId;
|
|
|
|
|
}
|
|
|
|
|
$map['s.pay_status']=1;
|
|
|
|
|
$map['s.is_check']=1;
|
|
|
|
|
// dd($map);
|
|
|
|
|
$field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
|
|
|
|
|
SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
|
|
|
|
@ -775,6 +777,8 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
$row = 10;
|
|
|
|
|
}
|
|
|
|
|
$map['pay_status'] = 1;
|
|
|
|
|
$map['is_check'] = 1;
|
|
|
|
|
|
|
|
|
|
if (!empty(I("game_id"))) {
|
|
|
|
|
$map['game_id'] = I("game_id");
|
|
|
|
|
}
|
|
|
|
@ -893,6 +897,7 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$map['s.pay_status']=1;
|
|
|
|
|
$map['s.is_check']=1;
|
|
|
|
|
$query = M("spend","tab_")->alias("s")
|
|
|
|
|
->field("s.game_id,s.game_name,s.sdk_version,p.partner as partner_name,
|
|
|
|
|
SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
|
|
|
|
@ -946,7 +951,7 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
->join("tab_promote promote ON s.promote_id = promote.id","left")
|
|
|
|
|
->join("tab_promote_company company ON promote.company_id = company.id","left");
|
|
|
|
|
}
|
|
|
|
|
$data = $query->where(['s.pay_status' => 1])
|
|
|
|
|
$data = $query->where(['s.pay_status' => 1,'s.is_check'=>1])
|
|
|
|
|
->where($map)
|
|
|
|
|
->find();
|
|
|
|
|
return $data;
|
|
|
|
@ -996,6 +1001,7 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
$row = 10;
|
|
|
|
|
}
|
|
|
|
|
$map['pay_status'] = 1;
|
|
|
|
|
$map['is_check'] = 1;
|
|
|
|
|
|
|
|
|
|
if (!empty(I('user_account'))) {
|
|
|
|
|
$map['tab_spend.user_account'] = array('like','%'.I("user_account").'%');
|
|
|
|
|