视频收益与语音收益修改

application/admin/controller/Agent.php

@@ -156,10 +156,10 @@ class Agent extends Backend
         $recharge_sum = Db::name('user_agentjewel_log')->where('user_id','IN',$downall_uid)->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('change_value');
         $result['recharge_sum'] = $recharge_sum;
         //视频收益
-        $video_sum = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+        $video_sum = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
         $result['video_sum'] = $video_sum;
         //语音收益
-        $audio_sum = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+        $audio_sum = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
         $result['audio_sum'] = $audio_sum;
         //私信收益
         $typing_sum= Db::name('user_match_typing_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
@@ -176,10 +176,10 @@ class Agent extends Backend
         $a = Db::name('user_agentjewel_log')->where('user_id','IN',$downall_uid)->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('user_id')->select();
         $a1 = array_column($a,'user_id');
 
-        $b = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
+        $b = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
         $b1 = array_column($b,'to_user_id');
 
-        $c = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
+        $c = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
         $c1 = array_column($c,'to_user_id');
 
         $d = Db::name('user_match_typing_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
@@ -356,10 +356,10 @@ class Agent extends Backend
             $recharge_sum = Db::name('user_agentjewel_log')->where('user_id',$user['id'])->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('change_value');
 //            $user['recharge_sum'] = $recharge_sum;
             //视频收益
-            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user['id'])->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user['id'])->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
 //            $user['video_sum'] = $video_sum;
             //语音收益
-            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user['id'])->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user['id'])->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
 //            $user['audio_sum'] = $audio_sum;
             //私信收益
             $typing_sum= Db::name('user_match_typing_log')->where('to_user_id',$user['id'])->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
@@ -474,10 +474,10 @@ class Agent extends Backend
             $recharge_sum = Db::name('user_agentjewel_log')->where('user_id',$user_id)->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('change_value');
             $thisday['recharge_sum'] = $recharge_sum;
             //视频收益
-            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user_id)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user_id)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
             $thisday['video_sum'] = $video_sum;
             //语音收益
-            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user_id)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user_id)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
             $thisday['audio_sum'] = $audio_sum;
             //私信收益
             $typing_sum= Db::name('user_match_typing_log')->where('to_user_id',$user_id)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');

application/api/controller/Match.php

@@ -134,6 +134,7 @@ class Match extends Api
                 'user_id' => $this->auth->id,
                 'price' => $price,
                 'createtime' => time(),
+                'updatetime' => time(),
                 'to_user_id' => $to_user_id,
                 'money' => $money,
                 'request_id' => $request_id,

application/api/controller/Userintro.php

@@ -228,10 +228,10 @@ class Userintro extends Api
         $recharge_sum = Db::name('user_agentjewel_log')->where('user_id','IN',$downall_uid)->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('change_value');
         $result['recharge_sum'] = $recharge_sum;
         //视频收益
-        $video_sum = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+        $video_sum = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
         $result['video_sum'] = $video_sum;
         //语音收益
-        $audio_sum = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+        $audio_sum = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
         $result['audio_sum'] = $audio_sum;
         //私信收益
         $typing_sum= Db::name('user_match_typing_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
@@ -248,10 +248,10 @@ class Userintro extends Api
         $a = Db::name('user_agentjewel_log')->where('user_id','IN',$downall_uid)->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('user_id')->select();
         $a1 = array_column($a,'user_id');
 
-        $b = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
+        $b = Db::name('user_match_video_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
         $b1 = array_column($b,'to_user_id');
 
-        $c = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('updatetime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
+        $c = Db::name('user_match_audio_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
         $c1 = array_column($c,'to_user_id');
 
         $d = Db::name('user_match_typing_log')->where('to_user_id','IN',$downall_uid)->where('createtime','BETWEEN',[$starttime,$endtime])->distinct(true)->field('to_user_id')->select();
@@ -407,10 +407,10 @@ class Userintro extends Api
             $recharge_sum = Db::name('user_agentjewel_log')->where('user_id',$user['id'])->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('change_value');
 //            $user['recharge_sum'] = $recharge_sum;
             //视频收益
-            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user['id'])->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user['id'])->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
 //            $user['video_sum'] = $video_sum;
             //语音收益
-            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user['id'])->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user['id'])->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
 //            $user['audio_sum'] = $audio_sum;
             //私信收益
             $typing_sum= Db::name('user_match_typing_log')->where('to_user_id',$user['id'])->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
@@ -498,10 +498,10 @@ class Userintro extends Api
             $recharge_sum = Db::name('user_agentjewel_log')->where('user_id',$user_id)->where('log_type',51)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('change_value');
             $thisday['recharge_sum'] = $recharge_sum;
             //视频收益
-            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user_id)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $video_sum = Db::name('user_match_video_log')->where('to_user_id',$user_id)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
             $thisday['video_sum'] = $video_sum;
             //语音收益
-            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user_id)->where('updatetime','BETWEEN',[$starttime,$endtime])->sum('money');
+            $audio_sum = Db::name('user_match_audio_log')->where('to_user_id',$user_id)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');
             $thisday['audio_sum'] = $audio_sum;
             //私信收益
             $typing_sum= Db::name('user_match_typing_log')->where('to_user_id',$user_id)->where('createtime','BETWEEN',[$starttime,$endtime])->sum('money');

public/assets/js/backend/user/user.js

@@ -28,9 +28,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
 //                        {field: 'group_id', title: __('Group_id')},
                         {field: 'usergroup.name', title: __('Usergroup.name'), operate: 'LIKE'},
-//                        {field: 'intro_uid', title: __('Intro_uid')},
-//                        {field: 'agent_id', title: __('Agent_id')},
-//                        {field: 'yaoqingtime', title: __('Yaoqingtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'intro_uid', title: __('Intro_uid')},
+                        {field: 'agent_id', title: __('Agent_id')},
+                        {field: 'yaoqingtime', title: __('Yaoqingtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'invite_uid', title: __('Invite_uid')},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},