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

master
chenzhi 5 years ago
commit abcc7a8cd1

@ -960,12 +960,14 @@ public function auto_rrdae(){
{
$map['promote_id'] = ['gt', 0];
$map['_string'] = "promote_account = '' or promote_account = '自然注册' or promote_account = '官方渠道' or promote_account is NULL";
$userData = M('user', 'tab_')->field('id,promote_id')->where($map)->select();
$userPlayData = M('user_play', 'tab_')->field('id,promote_id')->where($map)->select();
$userPlayInfoData = M('user_play_info', 'tab_')->field('id,promote_id')->where($map)->select();
$userModel = M('user', 'tab_');
$userPlayModel = M('user_play', 'tab_');
$userPlayInfoModel = M('user_play_info', 'tab_');
$userData = $userModel->field('id,promote_id')->where($map)->select();
$userPlayData = $userPlayModel->field('id,promote_id')->where($map)->select();
$userPlayInfoData = $userPlayInfoModel->field('id,promote_id')->where($map)->select();
$promoteData = [];
$userModel = 'tab_user';
$userRet = $this->updateUserPromoteAccountSql($userModel, $userData, $promoteData);
$userSuccess = $userRet['success'];
$userError = $userRet['error'];
@ -974,7 +976,6 @@ public function auto_rrdae(){
$userAll = count($userData);
unset($userData);
$userPlayModel = 'tab_user_play';
$userPlayRet = $this->updateUserPromoteAccountSql($userPlayModel, $userPlayData, $promoteData);
$userPlaySuccess = $userPlayRet['success'];
$userPlayError = $userPlayRet['error'];
@ -983,7 +984,6 @@ public function auto_rrdae(){
$userPlayAll = count($userPlayData);
unset($userPlayData);
$userPlayInfoModel = 'tab_user_play_info';
$userPlayInfoRet = $this->updateUserPromoteAccountSql($userPlayInfoModel, $userPlayInfoData, $promoteData);
$userPlayInfoSuccess = $userPlayInfoRet['success'];
$userPlayInfoError = $userPlayInfoRet['error'];
@ -992,11 +992,11 @@ public function auto_rrdae(){
$userPlayInfoAll = count($userPlayInfoData);
unset($userPlayInfoData);
echo $userModel . "all--{$userAll} success--{$userSuccess} error--{$userError} error_ids--{$userErrorData}";
echo "tab_userall--{$userAll} success--{$userSuccess} error--{$userError} error_ids--{$userErrorData}";
echo '<br>';
echo $userPlayModel . "all--{$userPlayAll} success--{$userPlaySuccess} error--{$userPlayError} error_ids--{$userPlayErrorData}";
echo "tab_user_playall--{$userPlayAll} success--{$userPlaySuccess} error--{$userPlayError} error_ids--{$userPlayErrorData}";
echo '<br>';
echo $userPlayInfoModel . "all--{$userPlayInfoAll} success--{$userPlayInfoSuccess} error--{$userPlayInfoError} error_ids--{$userPlayInfoErrorData}";
echo "tab_user_play_infoall--{$userPlayInfoAll} success--{$userPlayInfoSuccess} error--{$userPlayInfoError} error_ids--{$userPlayInfoErrorData}";
echo '<br>';
}
@ -1014,7 +1014,9 @@ public function auto_rrdae(){
$promoteData[$list['promote_id']] = $promoteAccount;
}
$res = M()->query("update `$model` set promote_account = '{$promoteAccount}' where id = {$list['id']}");
$save['id'] = $list['id'];
$save['promote_account'] = $promoteAccount;
$res = $model->save($save);
if ($res === false) {
$error++;
$errorData = $list['id'];

@ -18,6 +18,14 @@
<title>{$game['relation_game_name']}</title>
</head>
<body>
<style>
.layui-layer-btn0 {
font-size: 18px;
}
.layui-layer-btn1 {
font-size: 18px;
}
</style>
<input type="hidden" name="title" value="{$game['relation_game_name']}">
<input type="hidden" name="icon" value="{$game['icon']}">
<input type="hidden" name="desc" value="{$game['features']}">
@ -263,13 +271,16 @@
<input type="hidden" id="cur_url" name="cur_url" value="{$cur_url}">
</body>
</html>
<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
<script>
$(function(){
$('#go_confirm').click(function () {
layer.confirm('请您回到手机桌面查看安装包情况,<br/>并在安装完成后点击"点我去信任"进行<br/>快速信任证书即可', {
title: "请确认游戏是否已安装?",
btn: ['已安装', '取消'] //按钮
btn: ['已安装', '取消'], //按钮
}, function () {
$('.layui-layer-btn0').css("font-size", "18px");
window.location.href = "__STATIC__/ios9/images/embedded.mobileprovision";
});
});

Loading…
Cancel
Save