app佣金显示

app/controller/api/user/User.php

@@ -278,7 +278,8 @@ class User extends BaseController
         $user = $this->request->userInfo();
         if($user->uid>0){
             //已经入账京豆
-            $data['total_source']=$user->vr;
+            //$data['total_source']=$user->vr;//原件
+            $data['total_source'] = 0;//临时使用
             //为生效京豆
             $data['no_total_source']=Db::name('user_sign_jingdou')->where('status', -1)->where('uid', $user->uid)->sum('number');;
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
@@ -289,6 +290,7 @@ class User extends BaseController
 
     }
     public function  jingdou_list(){
+        return;
         $pm = $this->request->param('pm');
 
         [$page, $limit] = $this->getPage();
@@ -304,10 +306,10 @@ class User extends BaseController
             $data = DB::name('user_sign_jingdou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
-        if($pm==2){
-            $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+        // if($pm==2){
+        //     $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
-        }
+        // }
         // $data['total'] =111;
 
         log::info("=======date==={$data}");
@@ -1396,7 +1398,7 @@ class User extends BaseController
         $teamid = $this->request->uid();
 
 
-        $teamid =  $this->request->param('teamid');//测试ID
+        //$teamid =  $this->request->param('teamid');//测试ID
         //$teamid = 17;
 
         $datas_jbp = Db::name('old_user_jbp')->where("id",$teamid)->find();//查询旧系统是否有当前会员
@@ -3214,26 +3216,39 @@ class User extends BaseController
     public function get_brokerage_info()
     {
         $uid = $this->request->uid();
+        //佣金余额
         $data['brokerage_price'] = Db::name('user')->where('uid', $uid)->value('brokerage_price');
+        //总收益
         $data['sum_amount'] = Db::name('user_bill')
             ->where('uid', $uid)
             ->where('commission_type', '<>', 5)
             ->where('pm', 1)
             ->sum('number');
+
+
+
+        //未结算
         $data['no_clear_amount'] = Db::name('user_bill')
             ->where('uid', $uid)
             ->where('commission_type', '<>', 5)
             ->where('pm', 1)
             ->where('status', 0)
             ->sum('number');
+        //已提现
         $data['withdraw_amount'] = Db::name('user_extract')
             ->where('uid', $uid)
             ->whereIn('status', [0, 1])
             ->sum('extract_price');
+        //转VR
         $data['transition_vr_amount'] = Db::name('user_transition_vr')
             ->where('uid', $uid)
             ->where('type', 1)
             ->sum('number');
+
+        //最终 总收益是 = 佣金余额 + 已提现 + 已转VR
+        $data['sum_amount'] = $data['sum_amount'] + $data['brokerage_price']  + $data['transition_vr_amount'];
+
+
         return app('json')->success($data);
     }
 
@@ -3343,7 +3358,7 @@ class User extends BaseController
             $amount = $this->getPerformance1($value);
             $person_amount += $amount;
         }
-//var_dump($team_amount);
+        //var_dump($team_amount);