From 398e7c5e22d509f002f193e4937523fe164e3110 Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 3 Sep 2021 14:46:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ready.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ready.md b/ready.md index ef15d56..44bcf68 100644 --- a/ready.md +++ b/ready.md @@ -24,8 +24,26 @@ TRUNCATE `user_channels`; TRUNCATE `user_favs`; TRUNCATE `user_money_logs`; TRUNCATE `agents`; +TRUNCATE `admin_agent_role_users`; TRUNCATE `suppliers`; +TRUNCATE `admin_supplier_role_users`; TRUNCATE `guides`; +TRUNCATE `admin_guide_role_users`; + +# 代理商管理员 lingfeng16888 +INSERT INTO `agents` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `appid`, `appsecret`, `mchid`, `mchkey`, `status`, `type`, `company_name`, `logo`, `address`, `license_pic`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`) + VALUES (1, '领峰云', '$2y$10$7liU0oe8arMoM9hs992bJeqhlSyn6krdpaeX8zGJSp1RzcHO1qKvq', '总管理员', NULL, NULL, '', '', '', '', 1, 1, '总管理员', '', '', '', '总管理员', '13988889999', 0.00, NOW(), NOW(), NULL); +INSERT INTO `admin_agent_role_users` (`role_id`, `user_id`, `created_at`, `updated_at`) VALUES (1, 1, '2021-07-20 01:44:48', '2021-07-20 01:44:48'); + +# 供应商管理员 lingfeng16888 +INSERT INTO `suppliers` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `status`, `company_name`, `logo`, `address`, `license_pic`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`) + VALUES (1, '领峰云', '$2y$10$7liU0oe8arMoM9hs992bJeqhlSyn6krdpaeX8zGJSp1RzcHO1qKvq', '总管理员', NULL, NULL, 1, '总管理员', '', '', '', '总管理员', '13988889999', 0.00, '2021-08-26 11:28:17', '2021-08-30 17:45:14', NULL); +INSERT INTO `admin_supplier_role_users` (`role_id`, `user_id`, `created_at`, `updated_at`) VALUES (1, 1, '2021-07-20 01:44:48', '2021-07-20 01:44:48'); + +# 地接管理员 lingfeng16888 +INSERT INTO `guides` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `photo`, `license_pic`, `contact_phone`, `status`, `rate`, `created_at`, `updated_at`, `deleted_at`) + VALUES (1, '领峰云', '$2y$10$7liU0oe8arMoM9hs992bJeqhlSyn6krdpaeX8zGJSp1RzcHO1qKvq', '总管理员', NULL, NULL, '', '', '13988889999', 1, 0.00, '2021-08-19 13:29:55', '2021-08-19 13:29:55', NULL); +INSERT INTO `admin_guide_role_users` (`role_id`, `user_id`, `created_at`, `updated_at`) VALUES (1, 1, '2021-07-20 01:44:48', '2021-07-20 01:44:48'); INSERT INTO `categories` (`id`, `agent_id`, `pid`, `name`, `sort`, `template`, `deleted_at`) VALUES (1, 0, 0, '酒店', 255, '', NULL); INSERT INTO `categories` (`id`, `agent_id`, `pid`, `name`, `sort`, `template`, `deleted_at`) VALUES (2, 0, 0, '景点', 255, '', NULL); @@ -78,4 +96,5 @@ INSERT INTO `channels` (`id`, `agent_id`, `pid`, `name`, `icon`, `sort`, `delete ALTER TABLE `products` AUTO_INCREMENT=1000; + ``` From f4440e771ce495a5966b676e29391523a7c4f6a8 Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 3 Sep 2021 14:53:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E5=90=8E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/OrderController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 0f9bb70..7214ef3 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -222,7 +222,7 @@ class OrderController extends Controller } if ($formData['pay_type'] == PayType::OFFLINE) { //线下支付 - return $this->success('操作成功，请及时联系客服付款'); + return $this->success(['id' => $order_id], '操作成功，请及时联系客服付款'); } else { //在线支付或定金支付 $config = $this->payConfig($order, $price); if (!empty($config['paySign'])) { From 00add4ec0c4037ba81e6de8434635a20a599f199 Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 3 Sep 2021 15:18:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E6=9C=AA=E4=BB=98=E6=AC=BE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/OrderTimeout.php | 2 +- app/Http/Controllers/Api/OrderController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/OrderTimeout.php b/app/Console/Commands/OrderTimeout.php index 9601d8b..4cfa82f 100644 --- a/app/Console/Commands/OrderTimeout.php +++ b/app/Console/Commands/OrderTimeout.php @@ -42,7 +42,7 @@ class OrderTimeout extends Command public function handle() { //需要处理的订单状态 - $status_arr = [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST]; + $status_arr = [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST, OrderStatus::OFFLINE_UNPAID]; //记录最小ID，下次查询时按ID正序查询，只处理大于该ID的订单，避免重复扫描数据库 $min_id = Order::query()->whereIn('status', $status_arr)->min('id'); diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 7214ef3..1f30635 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -80,7 +80,7 @@ class OrderController extends Controller if ($v['timeout'] !== null) { $second = strtotime($v['timeout']) - $time; - if ($second > 0 && $v['status'] == Status::UNPAID) { + if ($second > 0) { $v['status_text'] = '请在' . ceil($second / 60) . '分钟内付款'; } else if ($second < 0 && $v['status'] == Status::PAY_EARNEST) { $v['status_text'] = '尾款支付已超时';