酒吧房:->相关接口提交-bug修改
This commit is contained in:
@@ -106,8 +106,8 @@ class GiftNew extends Model
|
||||
foreach ($list as $key =>&$v) {
|
||||
$v['is_lock'] = $is_lock;
|
||||
if($label==14){ //酒吧房自定义礼物 自定义
|
||||
$new_gift_name =db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_id'=>$v['gift_id'],'delete_time'=>0])->value('new_gift_name');
|
||||
$v['new_gift_name'] = $new_gift_name ?? '';
|
||||
$gift_remark_name =db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_id'=>$v['gift_id'],'delete_time'=>0])->value('gift_remark_name');
|
||||
$v['gift_remark_name'] = $gift_remark_name ?? '';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,19 +120,19 @@ class GiftNew extends Model
|
||||
}
|
||||
|
||||
//自定义礼物设置
|
||||
public function set_custom_gift($user_id, $gift_id, $new_gift_name){
|
||||
public function set_custom_gift($user_id, $gift_id, $gift_remark_name){
|
||||
$gift_info = db::name('vs_gift')->where(['gid' => $gift_id, 'delete_time' => 0, 'is_show' => 1])->find();
|
||||
if(!$gift_info){
|
||||
return ['code' => 0, 'msg' => '礼物不存在','data' =>null];
|
||||
}
|
||||
$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(['user_id' => $user_id,'gift_id'=>$gift_id])->update(['new_gift_name'=>$new_gift_name,'updatetime'=>time()]);
|
||||
db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_id'=>$gift_id])->update(['gift_remark_name'=>$gift_remark_name,'updatetime'=>time()]);
|
||||
}else{
|
||||
db::name('vs_user_custom_gift')->insert([
|
||||
'user_id' => $user_id,
|
||||
'gift_id'=>$gift_id,
|
||||
'new_gift_name'=>$new_gift_name,
|
||||
'gift_remark_name'=>$gift_remark_name,
|
||||
'createtime'=>time()
|
||||
]);
|
||||
}
|
||||
@@ -143,8 +143,8 @@ class GiftNew extends Model
|
||||
$list = db::name('vs_user_custom_gift')
|
||||
->alias('a')
|
||||
->join('vs_gift b','a.gift_id = b.gid')
|
||||
->field('a.id,b.gid as gift_id,a.new_gift_name,b.gift_name,b.base_image,b.gift_price,b.icon')
|
||||
->where(['a.user_id' => $user_id,'a.delete_time'=>0,'a.new_gift_name'=>['<>','']])
|
||||
->field('a.id,b.gid as gift_id,a.gift_remark_name,b.gift_name,b.base_image,b.gift_price,b.icon')
|
||||
->where(['a.user_id' => $user_id,'a.delete_time'=>0,'a.gift_remark_name'=>['<>','']])
|
||||
->order('a.sort desc ,a.updatetime desc')
|
||||
->select();
|
||||
return ['code' => 1, 'msg' => '获取成功','data' =>$list];
|
||||
|
||||
Reference in New Issue
Block a user