yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-01-11 00:29:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: commission process

Browse Source
This commit is contained in:
Tokumeikoi 2020-11-17 17:01:02 +08:00
parent 92e3e4e01f
commit 9035afaa78
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/OrderController.php
View File

@ -25,7 +25,7 @@ class OrderController extends Controller
} }
if ($request->input('is_commission')) { if ($request->input('is_commission')) {
$orderModel->where('invite_user_id', '!=', NULL); $orderModel->where('invite_user_id', '!=', NULL);
$orderModel->where('status', 3); $orderModel->whereIn('status', [3, 4]);
$orderModel->where('commission_balance', '>', 0); $orderModel->where('commission_balance', '>', 0);
} }
if ($request->input('id')) { if ($request->input('id')) {

2
app/Http/Requests/Admin/OrderUpdate.php
View File

@ -15,7 +15,7 @@ class OrderUpdate extends FormRequest
{ {
return [ return [
'status' => 'in:0,1,2,3', 'status' => 'in:0,1,2,3',
'commission_status' => 'in:0,1,2' 'commission_status' => 'in:0,1,3'
]; ];
} }

4
database/install.sql
View File

@ -107,7 +107,7 @@ CREATE TABLE `v2_order` (
`balance_amount` int(11) DEFAULT NULL COMMENT '使用余额', `balance_amount` int(11) DEFAULT NULL COMMENT '使用余额',
`surplus_order_ids` text COMMENT '折抵订单', `surplus_order_ids` text COMMENT '折抵订单',
`status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0待支付1开通中2已取消3已完成4已折抵', `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0待支付1开通中2已取消3已完成4已折抵',
`commission_status` tinyint(1) NOT NULL DEFAULT '0', `commission_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0待确认1发放中2有效3无效',
`commission_balance` int(11) NOT NULL DEFAULT '0', `commission_balance` int(11) NOT NULL DEFAULT '0',
`created_at` int(11) NOT NULL, `created_at` int(11) NOT NULL,
`updated_at` int(11) NOT NULL, `updated_at` int(11) NOT NULL,
@ -311,4 +311,4 @@ CREATE TABLE `v2_user` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- 2020-11-12 18:16:53 -- 2020-11-17 08:48:00

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/user/umi.js vendored
View File

File diff suppressed because one or more lines are too long