合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !598

@@ -93,7 +93,6 @@ class AdminIndexController extends AdminBaseController
         foreach ($list as $k => $item) {
         foreach ($list as $k => $item) {
             $uid = $item['id'];
             $uid = $item['id'];
             $role = $item['role'];
             $role = $item['role'];
-            $data = [];
             //如果此人为普通会员，只统计其金额总和
             //如果此人为普通会员，只统计其金额总和
             if ($role == 1) {
             if ($role == 1) {
                 $map = [
                 $map = [
@@ -102,6 +101,9 @@ class AdminIndexController extends AdminBaseController
                     'step' => ['neq', 1]
                     'step' => ['neq', 1]
                 ];
                 ];
                 $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
                 $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
+                $whole = $data[0]['whole'];
+                $whole_num = $data[0]['whole_num'];
+                $total = $whole - $whole_num;
             } else {
             } else {
                 //先查此人的下级
                 //先查此人的下级
                 $son_arr = Db::name('user')->where(['parent_id' => $item['id']])->field('id')->select();
                 $son_arr = Db::name('user')->where(['parent_id' => $item['id']])->field('id')->select();
@@ -120,12 +122,14 @@ class AdminIndexController extends AdminBaseController
                         'step' => ['neq', 1]
                         'step' => ['neq', 1]
                     ];
                     ];
                     $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
                     $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
+                    $whole = $data[0]['whole'];
+                    $whole_num = $data[0]['whole_num'];
+                    $total = $whole - $whole_num;
+                } else {
+                    $total = 0;
                 }
                 }
             }
             }
-            $whole = $data[0]['whole'];
-            $whole_num = $data[0]['whole_num'];
-            echo $total = $whole - $whole_num;
-            $item['total'] = 0;
+            $item['total'] = $total;
             $list[$k] = $item;
             $list[$k] = $item;
         }
         }