合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !581

@@ -96,7 +96,7 @@ class AdminIndexController extends AdminBaseController
             $role = $item['role'];
             $role = $item['role'];
             //如果此人为普通会员，统计只统计其金额总和
             //如果此人为普通会员，统计只统计其金额总和
             if($role == 1) {
             if($role == 1) {
-                $data = Db::name('order')->where(['uid'=>$uid,'pay_type'=>3])->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
+                $data = Db::name('zj_order')->where(['uid'=>$uid,'pay_type'=>3])->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;