diff --git a/application/api/model/GiftNew.php b/application/api/model/GiftNew.php index ca125351..f2be887d 100644 --- a/application/api/model/GiftNew.php +++ b/application/api/model/GiftNew.php @@ -133,14 +133,13 @@ class GiftNew extends Model $type = 1; } - $user_custom_gift = db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'room_id'=>$room_id,'gift_id'=>$gift_id])->find(); + $user_custom_gift = db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_id'=>$gift_id])->find(); if($user_custom_gift){ db::name('vs_user_custom_gift')->where(['id' => $user_custom_gift['id']])->update(['gift_remark_name'=>$gift_remark_name,'updatetime'=>time()]); }else{ $res = db::name('vs_user_custom_gift')->insert([ 'user_id' => $user_id, 'gift_id'=>$gift_id, - 'room_id'=>$room_id, 'gift_remark_name'=>$gift_remark_name, 'createtime'=>time() ]); diff --git a/application/common/controller/BaseCom.php b/application/common/controller/BaseCom.php index 17ef708b..ab87cc82 100644 --- a/application/common/controller/BaseCom.php +++ b/application/common/controller/BaseCom.php @@ -36,7 +36,7 @@ class BaseCom extends Controller if(empty($version)){ $version = request()->header('App-Version'); } - $zhenshi_version = db::name('version')->where('type', 2)->value('apiversion'); + $zhenshi_version = db::name('version')->where('type', 2)->value('newversion'); $result = version_compare($version,$zhenshi_version); //请求的接口 $api = request()->controller().'/'.request()->action();