elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
zyx 5 years ago
parent 5cfd492676 e8aa7eb4db
commit 926c72f8af
3 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File

35
Application/Home/Controller/QueryController.class.php
Unescape Escape View File

@ -958,7 +958,7 @@ class QueryController extends BaseController
$allData['spend_voucher'] = 0;
foreach ($data as &$list) {
$thisDateTime = strtotime($list['day']);
$userPlayInfoWhere['tab_user_play_info.play_time'] = ['between', [$thisDateTime, $thisDateTime + 86399]];
$userPlayInfoWhere['tab_user_play_info.create_time'] = ['between', [$thisDateTime, $thisDateTime + 86399]];
$userGameLoginWhere['tab_user_game_login_record.login_time'] = ['between', [$thisDateTime, $thisDateTime + 86399]];
$spendWhere['tab_spend.pay_time'] = ['between', [$thisDateTime, $thisDateTime + 86399]];
@ -976,7 +976,7 @@ class QueryController extends BaseController
->group('tab_user_play_info.user_id')
->select());//创角用户
$newUserSql = '(select count(ti.id) from tab_user_play_info as ti where ti.user_id = tab_user_play_info.user_id and ti.game_id = tab_user_play_info.game_id and ti.play_time < ' . $thisDateTime . $newWhere . ') as old_num';
$newUserSql = '(select count(ti.id) from tab_user_play_info as ti where ti.user_id = tab_user_play_info.user_id and ti.game_id = tab_user_play_info.game_id and ti.create_time < ' . $thisDateTime . $newWhere . ') as old_num';
$list['new_user_num'] = count($userPlayInfoModel
->field($newUserSql)
->join($join)
@ -985,15 +985,24 @@ class QueryController extends BaseController
->group('tab_user_play_info.user_id')
->having('old_num = 0')
->select());//新创角用户
$list['new_device_num'] = 0;//新创角设备
$newIpSql = '(select count(ti.id) from tab_user_play_info as ti where ti.play_ip = tab_user_play_info.play_ip and ti.game_id = tab_user_play_info.game_id and ti.play_time < ' . $thisDateTime . $newWhere . ') as old_num';
$newDeviceSql = '(select count(ti.id) from tab_user_play_info as ti where ti.create_device_number = tab_user_play_info.create_device_number and ti.game_id = tab_user_play_info.game_id and ti.create_time < ' . $thisDateTime . $newWhere . ') as old_num';
$list['new_device_num'] = count($userPlayInfoModel
->field($newDeviceSql)
->join($join)
->where($userPlayInfoWhere)
->where($map)
->group('tab_user_play_info.create_device_number')
->having('old_num = 0')
->select());//新创角设备
$newIpSql = '(select count(ti.id) from tab_user_play_info as ti where ti.create_ip = tab_user_play_info.create_ip and ti.game_id = tab_user_play_info.game_id and ti.create_time < ' . $thisDateTime . $newWhere . ') as old_num';
$list['new_ip_num'] = count($userPlayInfoModel
->field($newIpSql)
->join($join)
->where($userPlayInfoWhere)
->where($map)
->group('tab_user_play_info.play_ip')
->group('tab_user_play_info.create_ip')
->having('old_num = 0')
->fetchSql(true)
->select());//新增创角IP
@ -1215,7 +1224,7 @@ class QueryController extends BaseController
$newWhere = '';
$begTime = strtotime($initBegTime);
$endTime = strtotime($initEndTime);
$userPlayInfoWhere['tab_user_play_info.play_time'] = ['between', [$begTime, $endTime + 86399]];
$userPlayInfoWhere['tab_user_play_info.create_time'] = ['between', [$begTime, $endTime + 86399]];
$userGameLoginWhere['tab_user_game_login_record.login_time'] = ['between', [$begTime, $endTime + 86399]];
$spendWhere['tab_spend.pay_time'] = ['between', [$begTime, $endTime + 86399]];
$spendWhere['tab_spend.pay_status'] = 1;
@ -1238,7 +1247,7 @@ class QueryController extends BaseController
->group('tab_user_play_info.user_id')
->select());//创角用户
$newUserSql = '(select count(ti.id) from tab_user_play_info as ti where ti.user_id = tab_user_play_info.user_id and ti.game_id = tab_user_play_info.game_id and ti.play_time < ' . $begTime . $newWhere . ') as old_num';
$newUserSql = '(select count(ti.id) from tab_user_play_info as ti where ti.user_id = tab_user_play_info.user_id and ti.game_id = tab_user_play_info.game_id and ti.create_time < ' . $begTime . $newWhere . ') as old_num';
$list['new_user_num'] = count($userPlayInfoModel
->field($newUserSql)
->where($userPlayInfoWhere)
@ -1246,13 +1255,19 @@ class QueryController extends BaseController
->having('old_num = 0')
->select());//新创角用户
$list['new_device_num'] = 0;//新创角设备
$newDeviceSql = '(select count(ti.id) from tab_user_play_info as ti where ti.create_device_number = tab_user_play_info.create_device_number and ti.game_id = tab_user_play_info.game_id and ti.create_time < ' . $begTime . $newWhere . ') as old_num';
$list['new_device_num'] = count($userPlayInfoModel
->field($newDeviceSql)
->where($userPlayInfoWhere)
->group('tab_user_play_info.create_device_number')
->having('old_num = 0')
->select());//新创角设备
$newIpSql = '(select count(ti.id) from tab_user_play_info as ti where ti.play_ip = tab_user_play_info.play_ip and ti.game_id = tab_user_play_info.game_id and ti.play_time < ' . $begTime . $newWhere . ') as old_num';
$newIpSql = '(select count(ti.id) from tab_user_play_info as ti where ti.create_ip = tab_user_play_info.create_ip and ti.game_id = tab_user_play_info.game_id and ti.create_time < ' . $begTime . $newWhere . ') as old_num';
$list['new_ip_num'] = count($userPlayInfoModel
->field($newIpSql)
->where($userPlayInfoWhere)
->group('tab_user_play_info.play_ip')
->group('tab_user_play_info.create_ip')
->having('old_num = 0')
->fetchSql(true)
->select());//新增创角IP

2
Application/Mobile/Controller/SsgController.class.php
Unescape Escape View File

@ -23,6 +23,8 @@ class SsgController extends BaseController {
$user = session("user_auth");
$promoteId = I("promote_id");
if (!$promoteId) {
echo "链接失效，请重新向推广员索取链接。";
exit();
$this->error("参数非法");
}
$exists = M("promote", "tab_")->where(array('id' => $promoteId))->find();

37
Application/Sdk/Controller/Ipa365Controller.class.php
Unescape Escape View File

@ -7,8 +7,16 @@ use Mobile\Controller\SsgController;
// a8eeac3335cef5ee117d357738598f691932513b
class Ipa365Controller extends BaseController{
const signprice = 10; // 超级签价格
public $userinfo;
public function __construct() {
$this->userinfo = $_SESSION['onethink_home']['user_auth'];
parent::__construct();
}
public function test(){
$user = $this->userinfo;
pp($user);
die();
$ipa365 = new Ipa365Controller();
$result = $ipa365->pay_notify(array(
@ -95,7 +103,7 @@ class Ipa365Controller extends BaseController{
* 发起支付
*/
public function pay() {
$userId = $_SESSION['user_id'];
$userId = $this->userinfo['user_id'];
if (!$userId ) {
$this->error("请登入", "/mobile.php/ssg/login");
}
@ -165,8 +173,13 @@ class Ipa365Controller extends BaseController{
}
// 微信分享页面
public function paytip(){
$userId = $this->userinfo['user_id'];
if (!$userId ) {
$this->error("请登入", "/mobile.php/ssg/login");
}
$orderId = I('order_id');
$payLog = M('game_supersign', 'tab_')->where(array(
@ -214,11 +227,15 @@ class Ipa365Controller extends BaseController{
public function install_show() {
$orderId = I('order_id', 0);
$gameId = I('game_id', 0);
$userId = I('user_id', 0);
/* $userId = I('user_id', 0);
$user = M('user', 'tab_')->where(array(
'id' => $userId
))->find();
))->find(); */
$userId = $this->userinfo['user_id'];
if (!$userId ) {
$this->error("请登入", "/mobile.php/ssg/login");
}
// $userId = $_SESSION['user_id'];
if (!$userId ) {
@ -250,7 +267,7 @@ class Ipa365Controller extends BaseController{
* 获取用户安装历史url
*/
public function get_install_list() {
$gameId = I('game_id', 0);
/* $gameId = I('game_id', 0);
$where = array(
'pay_status' => 1,
'ticket' => array('neq', '')
@ -261,14 +278,14 @@ class Ipa365Controller extends BaseController{
// pp($list);
$url = $game['supersign_url']."?code={$code}";
pp($url);
redirect($url);
redirect($url); */
}
/**
* 用户点击安装
*/
public function install() {
$userId = I('user_id', 0);
$userId = $this->userinfo['user_id'];
if (!$userId ) {
$this->error("请登入", "/mobile.php/ssg/login");
}
@ -342,7 +359,11 @@ class Ipa365Controller extends BaseController{
* 打包列表
*/
public function pay_list() {
$userId = 0;
$userId = $this->userinfo['user_id'];
if (!$userId ) {
$this->error("请登入", "/mobile.php/ssg/login");
}
$list = M('game_supersion', 'tab_')->where(array(
'user_id' => $userId,
))->select();

Write Preview
Loading…
Cancel
Save