|
@@ -20,8 +20,19 @@ class UserPartakeController
|
|
|
*/
|
|
|
public function out_list(Request $request)
|
|
|
{
|
|
|
- $list = Out::where('status', 1)->order('id DESC')->select()->toArray();
|
|
|
+ [$page, $limit] = UtilService::getMore([['page', 1], ['limit', 10]], $request, true);
|
|
|
+ $list = Out::where('status', 1)->where($page, $limit)->order('id DESC')->select()->toArray();
|
|
|
+ return app('json')->success($list);
|
|
|
+ }
|
|
|
|
|
|
+ /**
|
|
|
+ * 出局奖励列表
|
|
|
+ * @return void
|
|
|
+ */
|
|
|
+ public function out_detail($id, Request $request)
|
|
|
+ {
|
|
|
+ $list = Out::where('status', 1)->where('id', $id)->order('id DESC')->find();
|
|
|
+ $list = $list ? $list->toArray() : [];
|
|
|
return app('json')->success($list);
|
|
|
}
|
|
|
|
|
@@ -52,7 +63,7 @@ class UserPartakeController
|
|
|
if ($res) {
|
|
|
Db::commit();
|
|
|
return app('json')->success('参与成功');
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
Db::rollback();
|
|
|
return app('json')->fail('参与失败');
|
|
|
}
|
|
@@ -83,9 +94,8 @@ class UserPartakeController
|
|
|
->page($where['page'], $where['limit'])
|
|
|
->select();
|
|
|
$data = count($data) ? $data->toArray() : [];
|
|
|
- foreach ($data as &$item)
|
|
|
- {
|
|
|
- if ($item['money'] == 0){
|
|
|
+ foreach ($data as &$item) {
|
|
|
+ if ($item['money'] == 0) {
|
|
|
$item['money'] = User::where('uid', $item['uid'])->find()['pay_price'];
|
|
|
}
|
|
|
}
|
|
@@ -94,6 +104,4 @@ class UserPartakeController
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
}
|