diff --git a/application/adminapi/controller/User.php b/application/adminapi/controller/User.php index a382fa15..c9d8bddf 100644 --- a/application/adminapi/controller/User.php +++ b/application/adminapi/controller/User.php @@ -434,7 +434,12 @@ class User extends adminApi $reslut = DB::name('user')->where('id', $user_id)->update($up_user); } if($up_user_data){ - $res = DB::name('user_auth')->where('mobile', $user['mobile'])->update($up_user_data); + $user_auth = DB::name('user_auth')->where('mobile', $user['mobile'])->find(); + if($user_auth){ + $res = DB::name('user_auth')->where('mobile', $user['mobile'])->update($up_user_data); + }else{ + $res = DB::name('user_auth')->insert($up_user_data); + } } return V(1,'操作成功'); } diff --git a/application/api/model/Gift.php b/application/api/model/Gift.php index 43cafe21..68563990 100644 --- a/application/api/model/Gift.php +++ b/application/api/model/Gift.php @@ -41,10 +41,10 @@ class Gift extends Model $where['label'] = ['<>',2]; } $is_lock = 0; - $is_open_blind_box_turntable = 0; - if($room_id){ - $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable'); - } + $is_open_blind_box_turntable = 1; +// if($room_id){ +// $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable'); +// } $list = $this->field('gid as gift_id,gift_name,base_image,gift_price')->where($map)->where($where)->order('sort asc, gift_price asc')->select(); if($label==2){ $list_data = []; diff --git a/application/api/model/Room.php b/application/api/model/Room.php index c0f94ea3..66e21a9a 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -59,6 +59,7 @@ class Room extends Model $data['apply_status'] = 1; }else{ $data['apply_status'] = 2; + $data['is_open_blind_box_turntable'] = 1; } $data['label_id'] = 1; }elseif ($type == 7){