|
@@ -102,6 +102,7 @@ class Grabgift extends Api
|
|
|
'user_id' => $this->auth->id,
|
|
|
'price' => $grab_info['price'],
|
|
|
'gift_id' => $grab_info['gift_id'],
|
|
|
+ 'myseatnum' => $count,
|
|
|
'createtime' => time(),
|
|
|
'grabstatus' => 0,
|
|
|
'grabtime' => 0,
|
|
@@ -118,7 +119,7 @@ class Grabgift extends Api
|
|
|
//如果是最后一个,开奖
|
|
|
$gift_name = '';
|
|
|
$winer_nickname = '';
|
|
|
- $new_seatnum = $seat_number;
|
|
|
+ $new_seatnum = $seat_number;//因为开奖之后,要用新一期的座位数
|
|
|
|
|
|
if($count == $seat_number){
|
|
|
|
|
@@ -175,7 +176,7 @@ class Grabgift extends Api
|
|
|
$grabgift_data = [
|
|
|
'price' => config('site.grabgift_price'),
|
|
|
'gift_id' => config('site.grabgift_giftid'),
|
|
|
- 'seat_num' => config('site.grabgift_seatnum'),
|
|
|
+ 'seat_number'=> config('site.grabgift_seatnum'),
|
|
|
'status' => 0,
|
|
|
'grabtime' => 0,
|
|
|
'createtime' => time(),
|
|
@@ -183,12 +184,17 @@ class Grabgift extends Api
|
|
|
$grabgift_data['id'] = Db::name('grabgift')->insertGetId($grabgift_data);
|
|
|
|
|
|
//redis标记状态,未开奖
|
|
|
- $this->redis->set('kge_grabgift_'.$grabgift_data['id'],$grabgift_data['seat_num']);
|
|
|
- $new_seatnum = $grabgift_data['seat_num'];
|
|
|
+ $this->redis->set('kge_grabgift_'.$grabgift_data['id'],$grabgift_data['seat_number']);
|
|
|
+ $new_seatnum = $grabgift_data['seat_number'];
|
|
|
}
|
|
|
}
|
|
|
Db::commit();
|
|
|
|
|
|
+ $user_list = Db::name('grabgift_log')->alias('log')->field('log.myseatnum,user.nickname,user.id as user_id,user.avatar')
|
|
|
+ ->join('user','log.user_id = user.id','LEFT')
|
|
|
+ ->where('log.grab_id',$grab_id)->order('log.myseatnum asc')->select();
|
|
|
+ $user_list = list_domain_image($user_list,['avatar']);
|
|
|
+
|
|
|
$result = [
|
|
|
'grab_id' => $grab_id,
|
|
|
'count' => $count,
|
|
@@ -199,6 +205,8 @@ class Grabgift extends Api
|
|
|
'avatar' => localpath_to_netpath($this->auth->avatar),
|
|
|
'gift_name' => $gift_name,
|
|
|
'winer_nickname' => $winer_nickname,
|
|
|
+
|
|
|
+ 'user_list' => $user_list
|
|
|
];
|
|
|
|
|
|
//socket推送
|