新的红色积分，计算方式改了

application/api/controller/Usercenter.php

@@ -27,18 +27,33 @@ class Usercenter extends Api
         //从lib/auth ->getUserinfo 拿过来
         $userinfo['score'] = model('wallet')->getWallet($this->auth->id,'score');//积分
         $userinfo['withdraw_score'] = Db::name('user_withdraw')->where('user_id',$this->auth->id)->where('status',1)->sum('score');//已兑换积分
-        $userinfo['share_score'] = Db::name('user_score_log')->where('user_id',$this->auth->id)->where('log_type','IN',[3,4])->sum('change_value');//分享奖励
+        $userinfo['share_score'] = Db::name('user_score_log')->where('user_id',$this->auth->id)->where('log_type',3)->sum('change_value');//分享奖励
         $userinfo['intro_number'] = Db::name('user')->where('intro_uid',$this->auth->id)->count('id');//我的粉丝
 
 
-        //获取业绩
+        //我的销售总额
         $yeji = $this->jiesuan_yeji($this->auth->id);
         $userinfo['yeji'] = $yeji;
 
-        //代理规则
+        //我自己的提成
         $rule = $this->jiesuan_daili_level($yeji);
-        $agent_score = bcdiv(bcmul($yeji,$rule['bili'],2),100,2);
-        $userinfo['agent_score'] = $agent_score;
+        $my_agent_score = bcdiv(bcmul($yeji,$rule['bili'],0),100,0);
+
+        //我的下级贡献上来的极差提成
+        $my_down_all_jicha_score = 0; //所有下级极差总额
+
+        $my_down_uids = Db::name('user')->where('intro_uid',$this->auth->id)->column('id'); //下级用户ids
+        if(!empty($my_down_uids)){
+            foreach($my_down_uids as $down_uid){
+                $down_yeji = $this->jiesuan_yeji($down_uid);
+                $down_rule = $this->jiesuan_daili_level($down_yeji);
+                $jicha_bili = $rule['bili'] - $down_rule['bili'];
+                $my_down_all_jicha_score = bcadd($my_down_all_jicha_score,bcmul($jicha_bili,$down_yeji));
+            }
+        }
+
+        //我的提成+下级极差提成
+        $userinfo['agent_score'] = bcadd($my_agent_score,$my_down_all_jicha_score);
 
         $this->success(1,$userinfo);
     }
@@ -130,10 +145,8 @@ class Usercenter extends Api
     //获取业绩
     private function jiesuan_yeji($user_id){
         //找到所有下级
-        //$user_ids = Db::name('user')->where('find_in_set(:intro_ids,intro_ids)', ['intro_ids' => $user_id])->column('id');
         $commonuser = new \app\common\model\User();
         $user_ids = $commonuser->my_down_all($user_id,[$user_id]);
-//        dump($user_ids);
 
         if(empty($user_ids)){
             return 0;
@@ -164,7 +177,6 @@ class Usercenter extends Api
     private function jiesuan_daili_level($yeji){
 
         $data = Db::name('zongdai')->order('id asc')->select();
-//        dump($data);
 
         $return = $data[0]; //默认第0个
         foreach($data as $key => $rule){