三个通话的remark

application/api/controller/Match.php

@@ -182,6 +182,9 @@ class Match extends Api
             if($task_status == 0){
                 $data['free_times'] = $user_match_video_log_info['free_times'] + 1;
                 $data['free_money'] = $user_match_video_log_info['free_money'] + $money;
+            }else{
+                $data['free_times'] = $user_match_video_log_info['free_times'];
+                $data['free_money'] = $user_match_video_log_info['free_money'];
             }
 
             $log_rs = Db::name('user_match_video_log')->where(['id' => $user_match_video_log_info['id']])->update($data);
@@ -275,9 +278,17 @@ class Match extends Api
 
         Db::commit();
 
+        $remark = '';
+        if($data['money'] > $data['free_money']){
+            $remark .= ('通话+'.($data['money'] - $data['free_money']).'金币');
+        }
+        if($data['free_money'] > 0){
+            $remark .= !empty($remark) ? ',' : '';
+            $remark .= ('新人补贴+'.$data['free_money'].'金币');
+        }
         $rs = [
             'get_jewel_value' => $data['money'],
-            'remark' => '通话+'.$data['money'].'金币，新人补贴+'.$data['free_money'].'金币',
+            'remark' => $remark,
             'next_minute' => $next_minute,
         ];
         $this->success('success',$rs);
@@ -374,6 +385,9 @@ class Match extends Api
             if($task_status == 0){
                 $data['free_times'] = $user_match_audio_log_info['free_times'] + 1;
                 $data['free_money'] = $user_match_audio_log_info['free_money'] + $money;
+            }else{
+                $data['free_times'] = $user_match_audio_log_info['free_times'];
+                $data['free_money'] = $user_match_audio_log_info['free_money'];
             }
 
             $log_rs = Db::name('user_match_audio_log')->where(['id' => $user_match_audio_log_info['id']])->update($data);
@@ -467,9 +481,17 @@ class Match extends Api
 
         Db::commit();
 
+        $remark = '';
+        if($data['money'] > $data['free_money']){
+            $remark .= ('通话+'.($data['money'] - $data['free_money']).'金币');
+        }
+        if($data['free_money'] > 0){
+            $remark .= !empty($remark) ? ',' : '';
+            $remark .= ('新人补贴+'.$data['free_money'].'金币');
+        }
         $rs = [
             'get_jewel_value' => $data['money'],
-            'remark' => '通话+'.$data['money'].'金币，新人补贴+'.$data['free_money'].'金币',
+            'remark' => $remark,
             'next_minute' => $next_minute,
         ];
         $this->success('success',$rs);
@@ -612,9 +634,15 @@ class Match extends Api
 
         Db::commit();
 
+
+        if($task_status == 0){
+            $remark = '新人补贴+'.$data['money'].'金币';
+        }else{
+            $remark = '+'.$data['money'].'金币';
+        }
         $rs = [
             'get_jewel_value' => $money,
-            'remark' => $task_status == 0 ? '新人补贴'.$money.'金币' : $money.'金币',
+            'remark' => $remark,
             'next_minute' => $next_minute,
         ];
         $this->success('success',$rs);