From a145ed559276c5c36095242c62d03aca0671e196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Sat, 16 Aug 2025 19:10:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=EF=BC=9A=20?= =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=BD=AC=E7=9B=98=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - application/adminapi/controller/BlindBox.php | 7 ++++ .../api/controller/BlindBoxTurntable.php | 22 +++++++++++ .../api/model/BlindBoxTurntableGift.php | 38 +++++++++++++++++++ application/api/model/Gift.php | 11 ++---- 5 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 application/api/controller/BlindBoxTurntable.php create mode 100644 application/api/model/BlindBoxTurntableGift.php diff --git a/.gitignore b/.gitignore index 9fecc42..d3d2905 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ .idea *.log .env - diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php index 8655072..960b0d3 100644 --- a/application/adminapi/controller/BlindBox.php +++ b/application/adminapi/controller/BlindBox.php @@ -131,6 +131,7 @@ class BlindBox extends adminApi $gift_id = input('gift_id', ''); $gift_bag_id = input('gift_bag_id', ''); $quantity = input('quantity', 0); + $weight = input('weight', 0); if(empty($gift_id)){ return V(0,"请选择礼物"); } @@ -153,6 +154,8 @@ class BlindBox extends adminApi $data['quantity'] = $quantity; $data['remaining_number'] = $quantity; $data['createtime'] = time(); + $data['weight'] = $weight; + $res = db::name($this->table)->insert($data); if($res){ return V(1,"成功"); @@ -184,6 +187,7 @@ class BlindBox extends adminApi if(empty($id)){ return V(0,"参数错误"); } + $weight = input('weight', 0); $gift_bag = db::name($this->table)->where('id',$id)->find(); // if($gift_bag['remaining_number']>0){ // return V(0,"该礼包已开售"); @@ -191,6 +195,9 @@ class BlindBox extends adminApi $data = []; $data['quantity'] = $quantity; $data['remaining_number'] = $quantity; + if($weight){ + $data['weight'] = $weight; + } $res = db::name($this->table)->where(['id'=>$id])->update($data); if($res){ return V(1,"成功"); diff --git a/application/api/controller/BlindBoxTurntable.php b/application/api/controller/BlindBoxTurntable.php new file mode 100644 index 0000000..5b679fc --- /dev/null +++ b/application/api/controller/BlindBoxTurntable.php @@ -0,0 +1,22 @@ +get_gift_list($gift_bag_id); + return v($reslut['code'], $reslut['msg'], $reslut['data']); + } +} \ No newline at end of file diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php new file mode 100644 index 0000000..69a8fd9 --- /dev/null +++ b/application/api/model/BlindBoxTurntableGift.php @@ -0,0 +1,38 @@ +where('gift_bag_id',$gift_bag_id)->order("id desc")->select(); + $gift_list = []; + foreach ($gifts as $key => $value) { + $gift_data = db::name('vs_gift')->where('gid',$value['foreign_id'])->where('delete_time',0)->find(); + if($gift_data){ + $gift_list[$key]['number'] = $key; + $gift_list[$key]['gift_id'] = $gift_data['gid']; + $gift_list[$key]['gift_name'] = $gift_data['gift_name']; + $gift_list[$key]['base_image'] = $gift_data['base_image']; + $gift_list[$key]['play_image'] = $gift_data['play_image']; + $gift_list[$key]['gift_price'] = $gift_data['gift_price']; + } + } + return ['code' => 1, 'msg' => '获取成功', 'data' => $gift_list]; + } +} diff --git a/application/api/model/Gift.php b/application/api/model/Gift.php index 505b100..c5100fc 100644 --- a/application/api/model/Gift.php +++ b/application/api/model/Gift.php @@ -44,13 +44,15 @@ class Gift extends Model if($label==2){ foreach ($list as &$v) { //获取盲盒列表 - $box_list = Db::name('vs_gift_bag')->where(['status'=>1])->where('activities_id',4)->select(); + $box_list = Db::name('vs_gift_bag')->where(['status'=>1])->where(['activities_id'=>["in",[4,5]]])->select(); foreach ($box_list as $key =>$box) { $ext = json_decode($box['ext'],true); if ($ext['gift_id'] == $v['gift_id']) { $v['gift_bag_name'] = $box['name']; $v['rule'] = $ext['description']; $v['rule_url'] = get_system_config_value('web_site')."/api/Page/get_gift_box_rule?box_id=".$box["id"]; + $v['activities_id'] = $box['activities_id']; + $v['gift_bag'] = $box['id']; break; } } @@ -58,11 +60,4 @@ class Gift extends Model } return ['code' => 1, 'msg' => '获取成功', 'data' => $list]; } - - /* - * 盲盒规则链接 - */ - public function get_gift_box_rule($box_id){ - - } }