送礼物，访问列表

application/api/controller/Gift.php

@@ -44,7 +44,7 @@ class Gift extends Api
         $userid = $user_id ? $user_id : $this->auth->id;
 
         $list = Db::name('gift_user_typing')->alias('log')
-            ->join('gift', 'gift.id = log.gift_id', 'LEFT')->field('log.*,sum(number) as number,gift.name,gift.image,gift.special')
+            ->join('gift', 'gift.id = log.gift_id', 'LEFT')->field('log.*,sum(number) as number,gift.image')
             ->where(['log.user_to_id' => $userid])
             ->group('log.gift_id')
             ->order('gift.price desc')
@@ -91,7 +91,7 @@ class Gift extends Api
         }
 
         // 判断当前用户余额
-        $user_gold = model('wallet')->getWallet($this->auth->id,'gold');
+        $user_gold = model('wallet')->getWallettotal($this->auth->id);
         if($user_gold < $giftvalue)
         {
             $this->error("您的金币余额不足");
@@ -112,6 +112,11 @@ class Gift extends Api
             'total_price' => $giftvalue,
             'createtime'  => time(),
         ];
+        //每个礼物都要计算平台抽成和房主抽成
+        $gift_plat_scale = config('site.gift_plat_scale');
+        $data['platvalue']    = bcmul($gift_plat_scale/100  ,$data["total_price"],1);//平台抽成
+        $data['getvalue']     = bcsub($data["total_price"] ,$data['platvalue'],1);//减去抽成剩余价值
+
         $log_id = Db::name('gift_user_typing')->insertGetId($data);
         if(!$log_id){
             Db::rollback();
@@ -121,28 +126,22 @@ class Gift extends Api
         if($giftvalue > 0){
 
             // 扣除当前用户余额
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,'gold',-$giftvalue,53,'赠送给'.$touserinfo['username'].'礼物:'.$giftinfo["name"],'gift_user_typing',$log_id);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,'gold',-$giftvalue,53,'赠送给'.$touserinfo['username'].'礼物:'.$giftinfo["name"].'X'.$number,'gift_user_typing',$log_id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);
             }
+        }
 
-            // 添加赠送用户余额
-            $money_to_gold = 1;
-            $gift_plat_scale = config('site.gift_plat_scale');
-
-            $giftmoney = bcdiv($giftvalue,$money_to_gold,2);
+        if($data['getvalue'] > 0){
 
-            $money = bcdiv(bcmul($giftmoney,100 - $gift_plat_scale,2),100,2);
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,'money',$money,54,'聊天赠送('.$this->auth->username.')礼物:'.$giftinfo["name"],'gift_user_typing',$log_id);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,'jewel',$data['getvalue'],54,$this->auth->username.'送给我礼物:'.$giftinfo["name"].'X'.$number,'gift_user_typing',$log_id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);
             }
         }
 
-
-
         Db::commit();
         $this->success('赠送成功');
 

application/api/controller/Match.php

@@ -34,7 +34,7 @@ class Match extends Api
 
         //正常价格
         $price = $to_user_info['match_video_price'];  //扣费金币
-        $gift_plat_scale = config('site.pipei_plat_scale');  //抽成比例
+        $gift_plat_scale = config('site.gift_plat_scale');  //抽成比例
         $money = bcdiv(bcmul($price,100 - $gift_plat_scale,2),100,2); //抽成后收益
 
         Db::startTrans();
@@ -167,7 +167,7 @@ class Match extends Api
 
         //正常价格
         $price = $to_user_info['match_audio_price'];  //扣费金币
-        $gift_plat_scale = config('site.pipei_plat_scale');  //抽成比例
+        $gift_plat_scale = config('site.gift_plat_scale');  //抽成比例
         $money = bcdiv(bcmul($price,100 - $gift_plat_scale,2),100,2); //抽成后收益
 
         Db::startTrans();
@@ -296,7 +296,7 @@ class Match extends Api
 
         //正常价格
         $price = $to_user_info['match_typing_price'];  //扣费金币
-        $gift_plat_scale = config('site.pipei_plat_scale');  //抽成比例
+        $gift_plat_scale = config('site.gift_plat_scale');  //抽成比例
         $money = bcdiv(bcmul($price,100 - $gift_plat_scale,2),100,2); //抽成后收益
 
         Db::startTrans();

application/api/controller/Uservisit.php

@@ -18,9 +18,9 @@ class Uservisit extends Api
         $list = Db::name('user_visit')
             ->alias('visit')
             ->join('user','visit.to_uid = user.id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,visit.updatetime')
-            ->where('visit.uid',$this->auth->id)->order('visit.updatetime desc')->autopage()->select();
-
+            ->field('user.id,user.nickname,user.avatar,visit.updatetime')
+            ->where('visit.uid',$this->auth->id)
+            ->order('visit.updatetime desc')->autopage()->select();
         $list = list_domain_image($list,['avatar']);
 
         foreach($list as $key => &$val){
@@ -29,7 +29,16 @@ class Uservisit extends Api
             unset($val['updatetime']);
         }
 
-        $this->success('success',$list);
+        $number = Db::name('user_visit')->alias('visit')
+            ->where('visit.uid',$this->auth->id)
+            ->count();
+
+        $result = [
+            'list'   => $list,
+            'number' => $number
+        ];
+
+        $this->success('success',$result);
     }
 
 
@@ -38,7 +47,7 @@ class Uservisit extends Api
         $list = Db::name('user_visit')
             ->alias('visit')
             ->join('user','visit.uid = user.id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,visit.updatetime')
+            ->field('user.id,user.nickname,user.avatar,visit.updatetime')
             ->where('visit.to_uid',$this->auth->id)
             ->order('visit.updatetime desc')->autopage()->select();
         $list = list_domain_image($list,['avatar']);

application/common/model/Wallet.php

@@ -88,7 +88,7 @@ class Wallet extends Model
         );
 
         //获取小数点
-        $point = $accountType == 'money' ? 2 : 0;
+        $point = $accountType == 'jewel' ? 1 : 0;
         bcscale($point);
 
         //钱包名称

application/extra/wallet.php

@@ -26,7 +26,7 @@ return [
 
 
         53 => '聊天赠送礼物',//gold -
-        54 => '聊天获得礼物',//money +
+        54 => '聊天获得礼物',//jewel +
 
 
         61 => '完成个人任务',//gold +