Commit caba03a6 by 冷斌

update

parent c3c98234
...@@ -717,6 +717,22 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -717,6 +717,22 @@ class Model_Live extends PhalApi_Model_NotORM {
'isOpen' => 1, 'isOpen' => 1,
'global_prompt' => $global_prompt, 'global_prompt' => $global_prompt,
); );
if ($global_prompt) {
$userInfo = getUserInfo($uid);
$liveUserInfo = getUserInfo($liveuid);
$home = new Model_Home();
$this->jpush([
'liveuid' => $liveuid,
'stream' => $stream,
'user_nickname' => $userInfo['user_nicename'],
'live_nickname' => $liveUserInfo['user_nicename'],
'gift_name' => $giftinfo['giftname'],
'number' => 1,
'info' => $home->getOnline($liveuid),
]);
}
return [ return [
'welfare' => $result, 'welfare' => $result,
'gift' => $result2, 'gift' => $result2,
...@@ -798,21 +814,6 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -798,21 +814,6 @@ class Model_Live extends PhalApi_Model_NotORM {
return 1002; return 1002;
} }
$userInfo = getUserInfo($uid);
$liveUserInfo = getUserInfo($liveuid);
$home = new Model_Home();
$this->jpush([
'liveuid' => $liveuid,
'stream' => $stream,
'user_nickname' => $userInfo['user_nicename'],
'live_nickname' => $liveUserInfo['user_nicename'],
'gift_name' => $giftinfo['giftname'],
'number' => $giftcount,
'info' => $home->getOnline($liveuid),
]);
$total= $giftinfo['needcoin']*$giftcount; $total= $giftinfo['needcoin']*$giftcount;
$addtime=time(); $addtime=time();
...@@ -1162,6 +1163,22 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -1162,6 +1163,22 @@ class Model_Live extends PhalApi_Model_NotORM {
'stream' => $stream, 'stream' => $stream,
'liveuid' => $liveuid, 'liveuid' => $liveuid,
); );
if ($global_prompt) {
$userInfo = getUserInfo($uid);
$liveUserInfo = getUserInfo($liveuid);
$home = new Model_Home();
$this->jpush([
'liveuid' => $liveuid,
'stream' => $stream,
'user_nickname' => $userInfo['user_nicename'],
'live_nickname' => $liveUserInfo['user_nicename'],
'gift_name' => $giftinfo['giftname'],
'number' => $giftcount,
'info' => $home->getOnline($liveuid),
]);
}
//file_put_contents('./zhifu.txt',date('Y-m-d H:i:s').' 提交参数信息 result:'.json_encode($result)."\r\n",FILE_APPEND); //file_put_contents('./zhifu.txt',date('Y-m-d H:i:s').' 提交参数信息 result:'.json_encode($result)."\r\n",FILE_APPEND);
return $result; return $result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment