定版之后bug修改
This commit is contained in:
@@ -46,11 +46,11 @@ class BlindBoxTurntable extends BaseCom
|
|||||||
* 礼物发放
|
* 礼物发放
|
||||||
*/
|
*/
|
||||||
public function gift_send(){
|
public function gift_send(){
|
||||||
$key_name = "api:blind_box_turntable:gift_send:" . $this->uid;
|
// $key_name = "api:blind_box_turntable:gift_send:" . $this->uid;
|
||||||
redis_lock_exit($key_name);
|
// redis_lock_exit($key_name);
|
||||||
$send_id = input('send_id',0);
|
$send_id = input('send_id',0);
|
||||||
$reslut = model('BlindBoxTurntableGift')->gift_send($send_id);
|
$reslut = model('BlindBoxTurntableGift')->gift_send($send_id);
|
||||||
redis_unlock($key_name);
|
// redis_unlock($key_name);
|
||||||
return v($reslut['code'], $reslut['msg'], $reslut['data']);
|
return v($reslut['code'], $reslut['msg'], $reslut['data']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -646,9 +646,6 @@ class BlindBoxTurntableGift extends Model
|
|||||||
$text_message = [];
|
$text_message = [];
|
||||||
foreach ($blind_box_turntable_log as $key => $value) {
|
foreach ($blind_box_turntable_log as $key => $value) {
|
||||||
$ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
|
$ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
|
||||||
$ToUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value['gift_user_id']);//财富图标
|
|
||||||
$ToUserInfo['icon'][1] = model('UserData')->user_charm_icon($value['gift_user_id']);//魅力图标
|
|
||||||
$ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $value['gift_user_id'],'room_id' => $room_id])->value('charm');//魅力
|
|
||||||
$draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
|
$draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
|
||||||
$textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
|
$textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
|
||||||
$play_image[] = $draw_gift['play_image'];
|
$play_image[] = $draw_gift['play_image'];
|
||||||
@@ -670,7 +667,10 @@ class BlindBoxTurntableGift extends Model
|
|||||||
$ToUserInfosList[$value['gift_user_id']] = $ToUserInfo;
|
$ToUserInfosList[$value['gift_user_id']] = $ToUserInfo;
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach($ToUserInfosList as $userInfo) {
|
foreach($ToUserInfosList as &$userInfo) {
|
||||||
|
$userInfo['icon'][0] = model('UserData')->user_wealth_icon($userInfo['user_id']);//财富图标
|
||||||
|
$userInfo['icon'][1] = model('UserData')->user_charm_icon($userInfo['user_id']);//魅力图标
|
||||||
|
$userInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $userInfo['user_id'],'room_id' => $room_id])->value('charm');//魅力
|
||||||
$ToUserInfos[] = $userInfo;
|
$ToUserInfos[] = $userInfo;
|
||||||
}
|
}
|
||||||
$text = [
|
$text = [
|
||||||
|
|||||||
@@ -50,9 +50,6 @@ class RoomPan
|
|||||||
$text_message = $user_nickname;
|
$text_message = $user_nickname;
|
||||||
foreach ($blind_box_turntable_results_log as $key => $value) {
|
foreach ($blind_box_turntable_results_log as $key => $value) {
|
||||||
$ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
|
$ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
|
||||||
$ToUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value['gift_user_id']);//财富图标
|
|
||||||
$ToUserInfo['icon'][1] = model('UserData')->user_charm_icon($value['gift_user_id']);//魅力图标
|
|
||||||
$ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $value['gift_user_id'],'room_id' => $room_id])->value('charm');//魅力
|
|
||||||
$draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
|
$draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
|
||||||
$textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
|
$textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
|
||||||
$play_image[] = $draw_gift['play_image'];
|
$play_image[] = $draw_gift['play_image'];
|
||||||
@@ -73,7 +70,10 @@ class RoomPan
|
|||||||
}
|
}
|
||||||
$ToUserInfosList[$value['gift_user_id']] = $ToUserInfo;
|
$ToUserInfosList[$value['gift_user_id']] = $ToUserInfo;
|
||||||
}
|
}
|
||||||
foreach($ToUserInfosList as $userInfo) {
|
foreach($ToUserInfosList as &$userInfo) {
|
||||||
|
$userInfo['icon'][0] = model('UserData')->user_wealth_icon($userInfo['user_id']);//财富图标
|
||||||
|
$userInfo['icon'][1] = model('UserData')->user_charm_icon($userInfo['user_id']);//魅力图标
|
||||||
|
$userInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $userInfo['user_id'],'room_id' => $room_id])->value('charm');//魅力
|
||||||
$ToUserInfos[] = $userInfo;
|
$ToUserInfos[] = $userInfo;
|
||||||
}
|
}
|
||||||
$text = [
|
$text = [
|
||||||
|
|||||||
Reference in New Issue
Block a user