diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index c4bc3af..34bfcac 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/application/api/model/BlindBoxTurntableGift.php @@ -405,8 +405,14 @@ class BlindBoxTurntableGift extends Model if(empty($pan_xlh)){ return ['code' => 0, 'msg' => '未开始', 'data' => null]; } + $xlh_user_data= []; if($pan_xlh['user_id']){ $xlh_user = db::name('user')->where('id',$pan_xlh['user_id'])->find(); + $xlh_user_data = [ + 'user_id' => $xlh_user['id'], + 'nickname' => $xlh_user['nickname'], + 'avatar' => $xlh_user['avatar'], + ]; } $result_data = [ 'title' => $xlh_box['name'], @@ -425,11 +431,7 @@ class BlindBoxTurntableGift extends Model 'gift_price' => $xlh_main_gift['gift_price'], 'base_image' => $xlh_main_gift['base_image'], ], - 'xlh_user' => [ - 'user_id' => $xlh_user['id'], - 'nickname' => $xlh_user['nickname'], - 'avatar' => $xlh_user['avatar'], - ], + 'xlh_user' => $xlh_user_data, 'gift_list' => $gift_list, ]; return ['code' => 1, 'msg' => '获取成功', 'data' => $result_data]; @@ -510,7 +512,7 @@ class BlindBoxTurntableGift extends Model //中奖 $pan_xlh = db::name('vs_room_pan_xlh')->where(['room_id'=>$room_id,'periods'=>$room['blind_box_turntable_periods']])->find(); if($pan_xlh){ - $pan_xlh = db::name('vs_room_pan_xlh')->where('id',$pan_xlh['id'])->update([ + db::name('vs_room_pan_xlh')->where('id',$pan_xlh['id'])->update([ 'user_id' => $user_id, 'num' => $pan_xlh['num'] + 1, ]); @@ -551,14 +553,18 @@ class BlindBoxTurntableGift extends Model //判断剩余数量是否为0 为0重置,进入下一期 $gift_bag_num = db::name("vs_room_pan")->where(['room_id'=>$room_id,'gift_bag_id'=>$gift_bag_id])->sum('remaining_number'); if($gift_bag_num <= 0){ - db::name("vs_gift_bag")->where('id',$gift_bag_id)->setInc('periods'); - db::name("vs_room")->where('id',$room_id)->setInc('blind_box_turntable_periods'); db::name("vs_room_pan")->where(['room_id'=>$room_id,'gift_bag_id'=>$gift_bag_id])->update( ['remaining_number' => db::raw('(SELECT quantity FROM fa_vs_gift_bag_detail WHERE id = fa_vs_room_pan.gift_bag_detail_id)')]); } }else{ return ['code' => 0, 'msg' => '失败!', 'data' => []]; } + $result_data[] = [ + 'user_id' => $user_id, + 'gift_id'=>$gift_bag_detail['foreign_id'], + 'gift_price'=>$gift['gift_price'], + 'is_public_screen'=>$gift['is_public_screen'], + ]; } // 添加活动记录 $reslut = Db::name('vs_activities_receive')->insert([ @@ -568,12 +574,6 @@ class BlindBoxTurntableGift extends Model 'createtime' => time(), 'updatetime' => time() ]); - $result_data = [ - 'user_id' => $user_id, - 'gift_id'=>$gift_bag_detail['foreign_id'], - 'gift_price'=>$gift['gift_price'], - 'is_public_screen'=>$gift['is_public_screen'], - ]; return ['code' => 1, 'msg' => '成功', 'data' => $result_data]; } }