合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !588

@@ -94,7 +94,6 @@ class AdminIndexController extends AdminBaseController
             $uid = $item['id'];
             $role = $item['role'];
             $data = [];
-            $total = 0;
             //如果此人为普通会员，只统计其金额总和
             if ($role == 1) {
                 $map = [
@@ -121,6 +120,8 @@ class AdminIndexController extends AdminBaseController
                         'step' => ['neq', 1]
                     ];
                     $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
+                }else {
+                    $total = 0;
                 }
             }
             $whole = $data[0]['whole'];