表名被滥用bug

application/api/controller/Gift.php

@@ -166,7 +166,7 @@ class Gift extends Api
                         }*/
                     }
                 }else{
-                    $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,$user_id,'jewel',-$giftvalue,33,'赠送礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_typing',$log_id);
+                    $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,$user_id,'jewel',-$giftvalue,33,'赠送礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_typing_jewel',$log_id);
                     if($wallet_rs['status'] === false){
                         Db::rollback();
                         $this->error($wallet_rs['msg']);

application/api/controller/Usercenter.php

@@ -521,7 +521,7 @@ class Usercenter extends Api
                     //上级获得金额
                     $intro_uid_money = number_format($money * $intro_income_rebate_rate / 100, 2, '.', '');
                     if ($intro_uid_money > 0) {
-                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$user_id,'money',$intro_uid_money,68, '邀请人开通守护获赠奖励','gift_user_typing',$log_id);
+                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$user_id,'money',$intro_uid_money,68, '邀请人开通守护获赠奖励','user_guard',$log_id);
                         if($intro_result['status']===false)
                         {
                             Db::rollback();
@@ -700,7 +700,7 @@ $resArray['money'] = $money;  //返回给前端的计算结果
                     //上级获得金额
                     $intro_uid_money = number_format($money * $intro_income_rebate_rate / 100, 2, '.', '');
                     if ($intro_uid_money > 0) {
-                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$to_user_id,'money',$intro_uid_money,68, '邀请人文字聊天获赠奖励','gift_user_typing',$log_id);
+                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$to_user_id,'money',$intro_uid_money,68, '邀请人文字聊天获赠奖励','user_match_typing_log',$log_id);
                         if($intro_result['status']===false)
                         {
                             Db::rollback();
@@ -849,7 +849,7 @@ $resArray['money'] = $money;  //返回给前端的计算结果
                     //上级获得金额
                     $intro_uid_money = number_format($money * $intro_income_rebate_rate / 100, 2, '.', '');
                     if ($intro_uid_money > 0) {
-                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$to_user_id,'money',$intro_uid_money,68, '邀请人语音聊天获赠奖励' . $data['call_minutes'] . '分钟','gift_user_typing',$log_id, 0, $request_id);
+                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$to_user_id,'money',$intro_uid_money,68, '邀请人语音聊天获赠奖励' . $data['call_minutes'] . '分钟','user_match_audio_log',$log_id, 0, $request_id);
                         if($intro_result['status']===false)
                         {
                             Db::rollback();
@@ -1017,7 +1017,7 @@ $resArray['money'] = $money;  //返回给前端的计算结果
                     //上级获得金额
                     $intro_uid_money = number_format($money * $intro_income_rebate_rate / 100, 2, '.', '');
                     if ($intro_uid_money > 0) {
-                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$to_user_id,'money',$intro_uid_money,68, '邀请人视频聊天获赠奖励' . $data['call_minutes'] . '分钟','gift_user_typing',$log_id, 0, $request_id);
+                        $intro_result = model('Wallet')->lockChangeAccountRemain($touserinfo['intro_uid'],$to_user_id,'money',$intro_uid_money,68, '邀请人视频聊天获赠奖励' . $data['call_minutes'] . '分钟','user_match_video_log',$log_id, 0, $request_id);
                         if($intro_result['status']===false)
                         {
                             Db::rollback();

application/api/controller/Userintro.php

@@ -154,44 +154,7 @@ class Userintro extends Api
         return $result;
     }
     
-    /*//邀请收益
-    public function introincome() {
-        $list = Db::name('user_gold_log')->where(['user_id' => $this->auth->id, 'log_type' => ['in', [64,65,66]]])->autopage()->select();
-        if (!$list) {
-            $this->success('success', $list);
-        }
 
-        //64 => '邀请注册奖励',
-        //65 => '邀请人充值奖励',
-        //66 => '邀请人获礼物奖励',
-
-        $mt_user = Db::name('user'); //绑定邀请码
-        $mt_pay_order = Db::name('pay_order'); //充值
-        $mt_gift_user_dongtai = Db::name('gift_user_dongtai'); //动态送礼
-//        $mt_gift_user_greet = Db::name('gift_user_greet'); //打招呼送礼
-        $mt_gift_user_typing = Db::name('gift_user_typing'); //聊天送礼
-        foreach ($list as &$v) {
-            if ($v['log_type'] == 64) {
-                $user_id = $v['table_id'];
-            } elseif ($v['log_type'] == 65) {
-                $user_id = $mt_pay_order->where(['id' => $v['table_id']])->value('user_id');
-            } else {
-                if ($v['remark'] == '打招呼礼物获赠奖励') {
-//                    $user_id = $mt_gift_user_greet->where(['id' => $v['table_id']])->value('user_to_id');
-                } elseif ($v['remark'] == '聊天礼物获赠奖励') {
-                    $user_id = $mt_gift_user_typing->where(['id' => $v['table_id']])->value('user_to_id');
-                } else {
-                    $user_id = $mt_gift_user_dongtai->where(['id' => $v['table_id']])->value('user_to_id');
-                }
-            }
-            $user_info = $mt_user->field('nickname, avatar')->where(['id' => $user_id])->find();
-            $v['nickname'] = $user_info['nickname'];
-            $v['avatar'] = one_domain_image($user_info['avatar']);
-            $v['createtime'] = date('Y.m.d H:i', $v['createtime']);
-        }
-
-        $this->success('success', $list);
-    }*/
 
     //我的邀请顶部信息
     public function myintrotop() {