Merge remote-tracking branch 'origin/develop' into develop

application/api/controller/UserWallet.php

@@ -58,6 +58,11 @@ class UserWallet extends BaseCom
     public function exchange_coin()
     {
         $earnings_num = input('earnings_num', 0);
+        //最少兑换钻石
+        $min_earnings_num = get_system_config_value('min_earnings_num');
+        if ($earnings_num < $min_earnings_num) {
+            return V(0, '兑换金额不能小于' . $min_earnings_num);
+        }
         $reslut = model('UserWallet')->exchange_coin($this->uid,$earnings_num);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }

application/api/model/RoomSong.php

@@ -362,6 +362,11 @@ class RoomSong extends Model
             ->order('sort desc')->select();
         //结束本首歌
         $now_song = db::name('vs_room_song')->where('did',$now_room_song_id)->update(['status'=>3]);
+        if($is_auto_next == 1){
+            $uid = db::name('vs_room_song')->where('did',$now_room_song_id)->value('user_id');
+            //任务：33-每日增加练歌房唱5首歌
+            model('Tasks')->tasks_complete($uid,33);
+        }
         if(empty($data)){
             Cache::rm("api:room:song:nextInfo:" . $room_id);
             $text = [
@@ -423,11 +428,6 @@ class RoomSong extends Model
             'nextInfo' => $next_song_info
         ];
         model('Chat')->sendMsg(1013,$room_id,$text);
-        if($is_auto_next == 1){
-            $uid = db::name('vs_room_song')->where('did',$now_room_song_id)->value('user_id');
-            //任务：33-每日增加练歌房唱5首歌
-            model('Tasks')->tasks_complete($uid,33);
-        }
 
         return ['code'=>1,'msg'=>'切歌成功','data'=>null];
     }