合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !589

@@ -121,7 +121,8 @@ class AdminIndexController extends AdminBaseController
                     ];
                     $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
                 }else {
-                    $total = 0;
+                    $data[0]['whole'] = 0;
+                    $data[0]['whole_num'] = 0;
                 }
             }
             $whole = $data[0]['whole'];