From 8b1deb767a0fb6a14e5f2595e98c56e23997095d Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Mon, 16 Aug 2021 00:19:16 +0800
Subject: [PATCH] =?UTF-8?q?deleted=5Fat=E6=94=B9=E4=B8=BATIMESTAMP?=
 =?UTF-8?q?=EF=BC=8Cpaid=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                             | 40 ++++++++++++++++++++
 app/Admin/Controllers/OrderController.php    |  4 +-
 app/Http/Controllers/Api/WxpayController.php |  2 +-
 app/Models/AgentProduct.php                  |  3 +-
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/MySQL_change.sql b/MySQL_change.sql
index 3c3f507..782ed19 100644
--- a/MySQL_change.sql
+++ b/MySQL_change.sql
@@ -293,5 +293,45 @@ ALTER TABLE `user_favs`
 
 
 
+# 0:00 ‎2021/‎08/‎16
+ALTER TABLE `suppliers`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `products`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `orders`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `orders`
+	CHANGE COLUMN `paid_at` `paid_at` VARCHAR(50) NULL DEFAULT NULL;
+UPDATE `orders` SET `paid_at` = FROM_UNIXTIME(`paid_at`, '%Y-%m-%d %H:%i:%s');
+ALTER TABLE `orders`
+	CHANGE COLUMN `paid_at` `paid_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `messages`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `guides`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `channels`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `categories`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `articles`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+ALTER TABLE `agent_products`
+	ADD COLUMN `deleted_at` TIMESTAMP NULL DEFAULT NULL AFTER `updated_at`;
+
+ALTER TABLE `agents`
+	CHANGE COLUMN `deleted_at` `deleted_at` TIMESTAMP NULL DEFAULT NULL;
+
+
+
+
 
 
diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index b7c3026..fe9b8fc 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -58,7 +58,7 @@ class OrderController extends AdminController
 				->using([0 => '在线支付', 1 => '定金支付', 2 => '首款支付', 3 => '线下支付']);
 			$grid->column('status', '订单状态')
 				->select(OrderStatus::array());
-			$grid->column('paid_at')->display(fn($v) => date('Y-m-d H:i:s', $v));
+			$grid->column('paid_at');
             $grid->column('created_at');
 			$grid->column('updated_at');
 
@@ -100,7 +100,7 @@ class OrderController extends AdminController
             $show->field('name');
             $show->field('num');
             $show->field('order_no');
-            $show->field('paid_at')->as(fn ($v) => date('Y-m-d H:i:s', $v));
+            $show->field('paid_at');
             $show->field('paid_money');
             $show->field('pay_type');
 			$show->field('title');
diff --git a/app/Http/Controllers/Api/WxpayController.php b/app/Http/Controllers/Api/WxpayController.php
index 5ab027c..1cd6583 100644
--- a/app/Http/Controllers/Api/WxpayController.php
+++ b/app/Http/Controllers/Api/WxpayController.php
@@ -75,7 +75,7 @@ class WxpayController
 								$order->status = OrderStatus::PAID;
 							}
 
-							$order->paid_at = time();
+							$order->paid_at = now();
 							$order->paid_money = DB::raw('`paid_money` + ' . $money);
 							$order->save();
 
diff --git a/app/Models/AgentProduct.php b/app/Models/AgentProduct.php
index a3b8996..bc05e45 100644
--- a/app/Models/AgentProduct.php
+++ b/app/Models/AgentProduct.php
@@ -3,10 +3,11 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class AgentProduct extends BaseModel
 {
-    use HasFactory;
+    use HasFactory, SoftDeletes;
 
     public function product()
 	{