diff --git a/application/api/model/GiveGift.php b/application/api/model/GiveGift.php index 64b598e4..355f26ef 100644 --- a/application/api/model/GiveGift.php +++ b/application/api/model/GiveGift.php @@ -1305,7 +1305,8 @@ class GiveGift extends Model 'user_id'=>$uid, 'total_price'=>$total_gift_price, 'type'=>$is_pack, - 'from'=>4//1聊天送礼物 2房间语聊送礼 3直播送礼 4动态打赏' + 'from'=>4,//1聊天送礼物 2房间语聊送礼 3直播送礼 4动态打赏' + 'createtime'=>time(), ]; $give_gift_res = Db::name('vs_give_gift')->insertGetId($give_gift_data); if(!$give_gift_res){ diff --git a/application/api/model/User.php b/application/api/model/User.php index 8baa10c7..25709b11 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -239,6 +239,7 @@ class User extends Model $singer = model('api/SingerSong')->singerAuthStatus($uid); $user_info['singer_status'] = $singer['status'];//歌手认证状态0-待审核,1-通过,2-拒绝 -1-未认证 $user_info['singer_level'] = $singer['level']; + $user_info['market_value'] = db::name('user')->where(['id' => $uid])->value('market_value'); if($singer['status'] == 1){ $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' =>$singer['level'],'deletetime' => 0])->value('image');//等级图标 } diff --git a/application/common/command/ProcessGiftQueue.php b/application/common/command/ProcessGiftQueue.php index 48c35506..904b49fc 100644 --- a/application/common/command/ProcessGiftQueue.php +++ b/application/common/command/ProcessGiftQueue.php @@ -8,7 +8,7 @@ use think\console\Input; use think\console\Output; use think\console\input\Argument; use think\console\input\Option; -use think\facade\Log; +use think\Log; use app\common\library\GiftQueue; class ProcessGiftQueue extends Command diff --git a/application/common/library/GiftDataMigrator.php b/application/common/library/GiftDataMigrator.php index b73cb428..caad27a9 100644 --- a/application/common/library/GiftDataMigrator.php +++ b/application/common/library/GiftDataMigrator.php @@ -113,9 +113,11 @@ class GiftDataMigrator { // 获取所有需要迁移的月份 $firstRecord = Db::name('vs_give_gift') + ->where('createtime', '>', 0) ->order('createtime', 'asc') ->find(); $lastRecord = Db::name('vs_give_gift') + ->where('createtime', '>', 0) ->order('createtime', 'desc') ->find();