客户端-修复养老金数据统计未减掉扣除项问题

app/controller/api/Auth.php

@@ -694,9 +694,9 @@ class Auth extends BaseController
         }
         //养老金展示
         // $data['annuity'] = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-        $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',0) -> sum('number');
-        $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-        $data['annuity'] = $a +$b;
+        $a = Db::name('user_bill')->where('uid', $user['uid'])->where('commission_type', 5)->where('pm', 1)->whereIn('status', [0, 1])->sum('number');
+        $b = Db::name('user_bill')->where('uid', $user['uid'])->where('commission_type', 5)->where('pm', 0)->whereIn('status', [0, 1])->sum('number');
+        $data['annuity'] = $a - $b;
         //上级身份是否大仓会员
         $is_da_cang_vip=Db::name('da_cang_user')->where('status',1)->where('uid',$user["uid"])->find();
         //渠道商

app/controller/api/user/User.php

@@ -2996,8 +2996,17 @@ class User extends BaseController
             'yanglao_a' => round($this->num($dy, 'yanglao_a'), 2),
         );
 
+        // 扣减
+
+        $kouchu = \think\facade\Db::name('user_bill')
+            ->where('pm', '=', 0)
+            ->where('status', '<>', '-1')
+            ->where(['uid' => $uid, 'commission_type' => '5', 'source' => 0])
+            ->sum('number');
+
         $data['all_num'] = $data['offLine']['num'] +$data['onLine_take_no']['num'] + $data['onLine']['num'] + $data['tb']['num'] + $data['jd']['num'] + $data['su']['num'] + $data['pdd']['num'] + $data['vip']['num'] + $data['dy']['num'];
         $data['all_yanglao'] = round($data['offLine']['yanglao']+$data['onLine']['yanglao'] + $data['onLine_take_no']['yanglao'] + $data['tb']['yanglao'] + $data['jd']['yanglao'] + $data['su']['yanglao'] + $data['pdd']['yanglao'] + $data['vip']['yanglao'] + $data['dy']['yanglao'], 2);
+        $data['all_yanglao'] -= $kouchu;
         $data['all_yanglao_a'] = round($data['offLine']['yanglao'] + $data['onLine']['yanglao'] + $data['tb']['yanglao_a'] + $data['jd']['yanglao_a'] + $data['su']['yanglao_a'] + $data['pdd']['yanglao_a'] + $data['vip']['yanglao_a'] + $data['dy']['yanglao_a'], 2);
         $data['third_party_num']=['all_num'=>$data['tb']['num']+$data['jd']['num']+$data['su']['num']+ $data['pdd']['num'] + $data['vip']['num']+ $data['dy']['num']];
         $data['third_party_num_a']=['all_num_a'=>$data['tb']['num_a']+$data['jd']['num_a']+$data['su']['num_a']+ $data['pdd']['num_a'] + $data['vip']['num_a']+ $data['dy']['num_a']];