合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !584

@@ -94,10 +94,14 @@ 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'];
+            $map = [
+                'uid' => ['eq', $item['id']],
+                'pay_type' => ['eq', 3],
+                'step' => ['neq', 1]
+            ];
             //如果此人为普通会员，只统计其金额总和
             //如果此人为普通会员，只统计其金额总和
             if($role == 1) {
             if($role == 1) {
-                $data = Db::name('zj_order')->where(['uid'=>$uid,'pay_type'=>3])->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
-                print_r($data);
+                $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
                 $whole = $data[0]['whole'];
                 $whole = $data[0]['whole'];
                 $whole_num = $data[0]['whole_num'];
                 $whole_num = $data[0]['whole_num'];
                 $total = $whole - $whole_num;
                 $total = $whole - $whole_num;