合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !603

@@ -121,7 +121,7 @@ class AdminIndexController extends AdminBaseController
                         'pay_type' => ['eq', 3],
                         'pay_type' => ['eq', 3],
                         '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 = $data[0]['whole'];
 //                    $whole_num = $data[0]['whole_num'];
 //                    $whole_num = $data[0]['whole_num'];
 //                    $total = $whole - $whole_num;
 //                    $total = $whole - $whole_num;