背景音乐，音视频任务

application/admin/view/task/edit.html

@@ -32,7 +32,7 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Android_url')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-android_url" class="form-control" name="row[android_url]" type="text" value="{$row.android_url|htmlentities}">
@@ -61,7 +61,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-number" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Exp')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Baseconfig.php

@@ -22,6 +22,7 @@ class Baseconfig extends Api
             'changyongyu'            => config('site.changyongyu'),//常用语温馨提示
             'zhanghaozhuxiao'            => config('site.zhanghaozhuxiao'),//账号注销
             'tuiguang_rule'            => config('site.tuiguang_rule'),//邀请推广须知
+            'match_bg_music'            => config('site.match_bg_music'),//音视频匹配背景音乐
         ];
 
         $this->success('success',$config);

application/api/controller/Match.php

@@ -80,6 +80,7 @@ class Match extends Api
         Db::startTrans();
 
         //检查剩余分钟数
+        $task_status = 0;//任务状态
         $user_wallet = Db::name('user_wallet')->where('user_id',$this->auth->id)->lock(true)->find();
         if($user_wallet['video_sec'] >= 1){
             //扣分钟数
@@ -87,6 +88,7 @@ class Match extends Api
             //补贴给对方0.1金币
             $money = 0.1;
         }else{
+            $task_status = 1;
             //需要扣别人的钱，判断钱是否购
             if($price > 0){
                 $goldtotal = model('wallet')->getWallettotal($this->auth->id);
@@ -172,15 +174,17 @@ class Match extends Api
 
         //tag任务赠送金币
         //与1名异性语音通话奖励
-        $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,11);
-        if($task_rs === false){
-            Db::rollback();
-            $this->error('完成任务赠送奖励失败');
-        }
-        $task_rs = \app\common\model\TaskLog::tofinish($to_user_id,11);
-        if($task_rs === false){
-            Db::rollback();
-            $this->error('完成任务赠送奖励失败');
+        if($task_status == 1){
+            $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,11);
+            if($task_rs === false){
+                Db::rollback();
+                $this->error('完成任务赠送奖励失败');
+            }
+            $task_rs = \app\common\model\TaskLog::tofinish($to_user_id,11);
+            if($task_rs === false){
+                Db::rollback();
+                $this->error('完成任务赠送奖励失败');
+            }
         }
 
         Db::commit();
@@ -216,6 +220,7 @@ class Match extends Api
         Db::startTrans();
 
         //检查剩余分钟数
+        $task_status = 0;//任务状态
         $user_wallet = Db::name('user_wallet')->where('user_id',$this->auth->id)->lock(true)->find();
         if($user_wallet['audio_sec'] >= 1){
             //扣分钟数
@@ -223,6 +228,7 @@ class Match extends Api
             //补贴给对方0.1金币
             $money = 0.1;
         }else{
+            $task_status = 1;
             //需要扣别人的钱，判断钱是否购
             if($price > 0){
                 $goldtotal = model('wallet')->getWallettotal($this->auth->id);
@@ -307,15 +313,17 @@ class Match extends Api
 
         //tag任务赠送金币
         //与1名异性语音通话奖励
-        $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,11);
-        if($task_rs === false){
-            Db::rollback();
-            $this->error('完成任务赠送奖励失败');
-        }
-        $task_rs = \app\common\model\TaskLog::tofinish($to_user_id,11);
-        if($task_rs === false){
-            Db::rollback();
-            $this->error('完成任务赠送奖励失败');
+        if($task_status == 1){
+            $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,11);
+            if($task_rs === false){
+                Db::rollback();
+                $this->error('完成任务赠送奖励失败');
+            }
+            $task_rs = \app\common\model\TaskLog::tofinish($to_user_id,11);
+            if($task_rs === false){
+                Db::rollback();
+                $this->error('完成任务赠送奖励失败');
+            }
         }
 
         Db::commit();

application/extra/site.php

@@ -118,4 +118,5 @@ return array (
   'man_reg_audio_sec' => '5',
   'man_reg_video_sec' => '5',
   'man_reg_typing_times' => '5',
+  'match_bg_music' => '/uploads/20240408/1aa22b2ee9d21cbe84f4e4cbbe6d52af.mp3',
 );