Merge branch 'master' into dev

app/controller/admin/user/User.php

@@ -1067,6 +1067,7 @@ class User extends BaseController
         $data['ylj']=$ylj?$ylj:0;
         $revenue = Db::name("user_bill")
             ->where(["uid" => $id, "type" => "commission"])
+            ->whereNotIn('commission_type', [0, 5, 7, 17, 19])
             ->whereIn('status', [1])
             ->sum('number');
         $data['revenue']=$revenue?$revenue:0;
@@ -1112,7 +1113,7 @@ class User extends BaseController
 //            'now_money' => $this->request->param('type', 0),
             'status' => $this->request->param('status'),
 //            'mer_id' => $this->request->merId()
-            'not_commission_type' => [5, 7, 17, 19],
+            'not_commission_type' => [0, 5, 7, 17, 19],
         ];
         if ($this->request->param('is_red') == true) {
             $where['is_red_brokerage'] = 1;