股份分红奖励记录增加总额统计，并完善列表展示内容

app/controller/admin/user/User.php

@@ -1522,7 +1522,7 @@ class User extends BaseController
             $where[] = ['o.create_time', 'between', [strtotime($dateRange[0]), strtotime($dateRange[1])]];
         }
         if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
-        if($account) $where[] = ['u.account','=',$account];
+        if($account) $where[] = ['u.account','like','%'.$account.'%'];
         if ($user_lianc_id) $where[] = ['o.user_lianc_id', '=', $user_lianc_id];
 
         $query = Db::name('old_user_originator')->alias('o')
@@ -1562,14 +1562,23 @@ class User extends BaseController
         [$page, $limit] = $this->getPage();
         $nickname = request()->param('nickname','');
         $account = request()->param('account','');
+        $dateRange = request()->param('dateRange', []);
         $where = [];
+
+        if (!empty($dateRange)) {
+            $where[] = ['o.create_time', 'between', [strtotime($dateRange[0]), strtotime($dateRange[1])]];
+        }
         if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
-        if($account) $where[] = ['u.account','=',$account];
+        if($account) $where[] = ['u.account','like','%'.$account.'%'];
         $query = Db::name('old_user_stock')->alias('o')
             ->leftJoin('user u','o.user_id=u.uid')
-            ->field('o.*,u.uid,u.real_name,u.nickname')
+            ->field('o.*,u.uid,u.real_name,u.nickname,u.account')
             ->where($where);
 
+        $query1 = clone($query);
+        $stock_getcomm = $query1->sum('getcomm');
+        $stock_allgetcomm = $query1->sum('allgetcomm');
+
         $data = $query->page($page)
             ->limit($limit)
             ->order('o.id desc')
@@ -1584,6 +1593,8 @@ class User extends BaseController
         }
         $return_data['list'] = $data;
         $return_data['count'] = $count;
+        $return_data['stock_getcomm'] = $stock_getcomm;
+        $return_data['stock_allgetcomm'] = $stock_allgetcomm;
         return app('json')->success($return_data);
     }