合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !637

@@ -97,7 +97,7 @@ class AdminIndexController extends AdminBaseController
             if ($role == 1) {
             if ($role == 1) {
                 $map = [
                 $map = [
                     'uid' => ['eq', $item['id']],
                     'uid' => ['eq', $item['id']],
-                    'pay_type' => ['eq', 3],
+                    'pay_type' => ['eq', 2],
                     '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();
@@ -118,14 +118,13 @@ class AdminIndexController extends AdminBaseController
                     }
                     }
                     $map = [
                     $map = [
                         'uid' => ['in', $son_str],
                         'uid' => ['in', $son_str],
-                        'pay_type' => ['eq', 3],
+                        'pay_type' => ['eq', 2],
                         'step' => ['neq', 1]
                         'step' => ['neq', 1]
                     ];
                     ];
-                    $data = Db::name('zj_order')->where($map)->field('*')->select();
-//                    $whole = $data[0]['whole'];
-//                    $whole_num = $data[0]['whole_num'];
-//                    $total = $whole - $whole_num;
-                    print_r($data->toArray());
+                    $data = Db::name('zj_order')->where($map)->field('sum(whole) as whole,sum(whole_num) as whole_num')->select();
+                    $whole = $data[0]['whole'];
+                    $whole_num = $data[0]['whole_num'];
+                    $total = $whole - $whole_num;
                 } else {
                 } else {
                     $total = 0;
                     $total = 0;
                 }
                 }