diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php index 6d74896..b2e43d1 100644 --- a/application/adminapi/controller/BlindBox.php +++ b/application/adminapi/controller/BlindBox.php @@ -856,7 +856,8 @@ class BlindBox extends adminApi foreach ($lists_data as $key => $value) { $lists[$key]['id'] = $value['id']; $lists[$key]['periods'] = $value['periods']; - $lists[$key]['user'] = $value['user_id']."-".db::name('user')->where('id',$value['user_id'])->value('nickname'); + $user = db::name('user')->field('user_code,nickname')->where('id',$value['user_id'])->find(); + $lists[$key]['user'] = $user['user_code']."-".$user['nickname']; //支付价格 $lists[$key]['pay_price'] = $value['pay_price']; $gift = db::name('vs_gift')->field('gid,gift_name,gift_price')->where('gid',$value['locking_gift_id'])->find(); diff --git a/application/api/model/Room.php b/application/api/model/Room.php index bfd7606..7d3ae4f 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -151,7 +151,7 @@ class Room extends Model if(!empty($data)){ $reslut = $this->where('id', $room_id)->update($data); if (!$reslut) { - return ['code' => 0, 'msg' => '修改失败', 'data' => null]; + return ['code' => 0, 'msg' => '请勿重复提交', 'data' => null]; } } //推送消息