From d55de58636aed0ae2002422fe18e198ea475eacf Mon Sep 17 00:00:00 2001 From: liapples Date: Sun, 15 Aug 2021 23:49:38 +0800 Subject: [PATCH] =?UTF-8?q?created=5Fat=E6=94=B9=E4=B8=BATIMESTAMP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MySQL_change.sql | 96 ++++++++++++++++++++ app/Admin/Controllers/AgentController.php | 8 +- app/Admin/Controllers/GuideController.php | 8 +- app/Admin/Controllers/OrderController.php | 8 +- app/Admin/Controllers/SupplierController.php | 8 +- app/Admin/Controllers/UserController.php | 4 +- app/Http/Controllers/Api/OrderController.php | 2 +- app/Http/Controllers/Api/WxpayController.php | 4 +- app/Models/BaseModel.php | 1 - 9 files changed, 117 insertions(+), 22 deletions(-) diff --git a/MySQL_change.sql b/MySQL_change.sql index a4ebfe0..96277a5 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -103,6 +103,102 @@ ALTER TABLE `guides` DROP INDEX `account`, ADD UNIQUE INDEX `account` (`username`) USING BTREE; +# 19:51 ‎2021/‎08/‎15 --created_at-- +ALTER TABLE `user_money_logs` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `user_money_logs` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `user_money_logs` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `user_favs` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `user_favs` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `user_favs` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `users` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `users` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `users` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `suppliers` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `suppliers` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `suppliers` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `specials` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `specials` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `specials` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `slides` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `slides` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `slides` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `products` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `products` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `products` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `orders` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `orders` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `orders` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `notices` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `notices` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `notices` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `messages` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `messages` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `messages` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `guides` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `guides` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `guides` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `coupons` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `coupons` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `coupons` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `articles` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `articles` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `articles` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `agent_products` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `agent_products` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `agent_products` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `agents` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `agents` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `agents` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `advertisings` + CHANGE COLUMN `created_at` `created_at` VARCHAR(50) NULL DEFAULT NULL; +UPDATE `advertisings` SET `created_at` = FROM_UNIXTIME(`created_at`, '%Y-%m-%d %H:%i:%s'); +ALTER TABLE `advertisings` + CHANGE COLUMN `created_at` `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP; diff --git a/app/Admin/Controllers/AgentController.php b/app/Admin/Controllers/AgentController.php index eb4608d..3f7c03e 100644 --- a/app/Admin/Controllers/AgentController.php +++ b/app/Admin/Controllers/AgentController.php @@ -37,8 +37,8 @@ class AgentController extends AdminController $grid->column('license_pic')->image(60, 60); $grid->column('director'); $grid->column('contact_phone'); - $grid->column('created_at')->display(fn($v) => $v); - $grid->column('updated_at')->display(fn($v) => $v); + $grid->column('created_at'); + $grid->column('updated_at'); $grid->column('status', '状态') ->if(fn() => $this->status == UserStatus::UNAUDITED) @@ -108,8 +108,8 @@ class AgentController extends AdminController ->as(function ($v) { return preg_replace('/.*?<\/script>/is', '', $this->agentInfo->buy_protocol); }); - $show->field('created_at')->as(fn($v) => date('Y-m-d H:i:s', $v)); - $show->field('updated_at')->as(fn($v) => date('Y-m-d H:i:s', $v)); + $show->field('created_at'); + $show->field('updated_at'); }); } diff --git a/app/Admin/Controllers/GuideController.php b/app/Admin/Controllers/GuideController.php index 1b016c9..0ca623b 100644 --- a/app/Admin/Controllers/GuideController.php +++ b/app/Admin/Controllers/GuideController.php @@ -33,8 +33,8 @@ class GuideController extends AdminController $grid->column('photo')->image(60, 60); $grid->column('license_pic')->image(60, 60); $grid->column('contact_phone'); - $grid->column('created_at')->display(fn($v) => $v); - $grid->column('updated_at')->display(fn($v) => $v); + $grid->column('created_at'); + $grid->column('updated_at'); $grid->column('status', '状态') ->if(fn() => $this->status == UserStatus::UNAUDITED) @@ -81,8 +81,8 @@ class GuideController extends AdminController $show->field('photo')->image(); $show->field('license_pic')->image(); $show->field('contact_phone'); - $show->field('created_at')->as(fn($v) => date('Y-m-d H:i:s', $v)); - $show->field('updated_at')->as(fn($v) => date('Y-m-d H:i:s', $v)); + $show->field('created_at'); + $show->field('updated_at'); }); } diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index 0367c24..b7c3026 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -59,8 +59,8 @@ class OrderController extends AdminController $grid->column('status', '订单状态') ->select(OrderStatus::array()); $grid->column('paid_at')->display(fn($v) => date('Y-m-d H:i:s', $v)); - $grid->column('created_at')->display(fn($v) => $v); - $grid->column('updated_at')->display(fn($v) => $v); + $grid->column('created_at'); + $grid->column('updated_at'); $grid->filter(function (Grid\Filter $filter) { $filter->panel(); @@ -110,8 +110,8 @@ class OrderController extends AdminController $show->field('status')->using(OrderStatus::array()); $show->field('title'); $show->field('user_id'); - $show->field('created_at')->as(fn ($v) => date('Y-m-d H:i:s', $v)); - $show->field('updated_at')->as(fn ($v) => date('Y-m-d H:i:s', $v)); + $show->field('created_at'); + $show->field('updated_at'); }); } diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index 6464d22..a04e2f4 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -37,8 +37,8 @@ class SupplierController extends AdminController $grid->column('license_pic'); $grid->column('director'); $grid->column('contact_phone'); - $grid->column('created_at')->display(fn($v) => $v->format('Y-m-d')); - $grid->column('updated_at')->display(fn($v) => $v->format('Y-m-d')); + $grid->column('created_at'); + $grid->column('updated_at'); $grid->column('status', '状态') ->if(fn() => $this->status == UserStatus::UNAUDITED) @@ -87,8 +87,8 @@ class SupplierController extends AdminController $show->field('license_pic')->image(60, 60); $show->field('director'); $show->field('contact_phone'); - $show->field('created_at')->as(fn($v) => date('Y-m-d H:i:s', $v)); - $show->field('updated_at')->as(fn($v) => date('Y-m-d H:i:s', $v)); + $show->field('created_at'); + $show->field('updated_at'); }); } diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index 177118a..2419151 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -29,8 +29,8 @@ class UserController extends AdminController $grid->column('nickname'); $grid->column('status')->bool(); $grid->column('verifier')->bool(); - $grid->column('created_at')->display(fn($v) => $v); - $grid->column('updated_at')->display(fn($v) => $v); + $grid->column('created_at'); + $grid->column('updated_at'); $grid->filter(function (Grid\Filter $filter) { $filter->panel(); diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 2cf3a6d..bfbb703 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -55,7 +55,7 @@ class OrderController extends Controller //10分钟内未付款订单提示付款 foreach ($order_list['data'] as &$v) { if ($v['status'] == Status::UNPAID) { - $minute = $time - $v['created_at']; + $minute = $time - strtotime($v['created_at']); //订单创建后10分钟内未付款则提示，否则取消订单 if ($minute < 600) { $v['status_text'] = '请在' . ceil($minute / 60) . '分钟内付款'; diff --git a/app/Http/Controllers/Api/WxpayController.php b/app/Http/Controllers/Api/WxpayController.php index 1579e27..5ab027c 100644 --- a/app/Http/Controllers/Api/WxpayController.php +++ b/app/Http/Controllers/Api/WxpayController.php @@ -96,7 +96,7 @@ class WxpayController 'type' => 1, 'desc' => DB::raw("LEFT('购买产品：{$order->title}', 250)"), 'transaction_id' => $message['transaction_id'], //微信支付订单号 - 'created_at' => time(), //模型没有updated_at，无法自动写入时间 + 'created_at' => now(), //模型没有updated_at，无法自动写入时间 ]); DB::commit(); @@ -191,7 +191,7 @@ class WxpayController 'type' => 2, 'desc' => DB::raw("LEFT('退款：{$order->title}', 250)"), 'transaction_id' => $reqInfo['transaction_id'], - 'created_at' => time(), + 'created_at' => now(), //模型没有updated_at，无法自动写入时间 ]); // 退库存 diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index 200cf17..43f3b02 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -9,7 +9,6 @@ class BaseModel extends Model { use HasDateTimeFormatter; - protected $dateFormat = 'U'; protected $host = ''; public function __construct(array $attributes = [])