From ba2f05cb644a21c14dcf2091d280765247032d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Thu, 16 Dec 2021 10:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Endpoint/Api/Filters/OrderFilter.php      |  4 +--
 app/Models/Order.php                          |  7 ++--
 .../2021_12_07_143655_create_orders_table.php |  2 ++
 ...dd_coupon_amount_to_user_coupons_table.php | 34 -------------------
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 database/migrations/2021_12_09_153242_add_coupon_amount_to_user_coupons_table.php

diff --git a/app/Endpoint/Api/Filters/OrderFilter.php b/app/Endpoint/Api/Filters/OrderFilter.php
index 5a3f920e..69692ee3 100644
--- a/app/Endpoint/Api/Filters/OrderFilter.php
+++ b/app/Endpoint/Api/Filters/OrderFilter.php
@@ -14,8 +14,8 @@ class OrderFilter extends ModelFilter
                 $this->where('status', Order::STATUS_PENDING);
                 break;
 
-            case 'paid':
-                $this->where('status', Order::STATUS_PAID);
+            case 'unreceived':
+                $this->where('status', [Order::STATUS_PAID, Order::STATUS_SHIPPED]);
                 break;
 
             case 'completed':
diff --git a/app/Models/Order.php b/app/Models/Order.php
index e48d79ea..15472054 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -10,9 +10,10 @@ class Order extends Model
 {
     use Filterable;
 
-    public const STATUS_PENDING = 0;    // 待付款
-    public const STATUS_PAID = 1;       // 已付款
-    public const STATUS_COMPLETED = 9;  // 已完成
+    public const STATUS_PENDING = 0;     // 待付款
+    public const STATUS_PAID = 1;        // 已付款
+    public const STATUS_SHIPPED = 2;     // 已发货
+    public const STATUS_COMPLETED = 9;   // 已完成
     public const STATUS_CANCELLED = 10;  // 已取消
 
     /**
diff --git a/database/migrations/2021_12_07_143655_create_orders_table.php b/database/migrations/2021_12_07_143655_create_orders_table.php
index 1b26fd66..9daf33ae 100644
--- a/database/migrations/2021_12_07_143655_create_orders_table.php
+++ b/database/migrations/2021_12_07_143655_create_orders_table.php
@@ -39,6 +39,8 @@ class CreateOrdersTable extends Migration
             $table->timestamps();
 
             $table->unique('sn');
+            $table->index(['user_id', 'status']);
+            $table->index('status');
         });
     }
 
diff --git a/database/migrations/2021_12_09_153242_add_coupon_amount_to_user_coupons_table.php b/database/migrations/2021_12_09_153242_add_coupon_amount_to_user_coupons_table.php
deleted file mode 100644
index aea13eff..00000000
--- a/database/migrations/2021_12_09_153242_add_coupon_amount_to_user_coupons_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddCouponAmountToUserCouponsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('user_coupons', function (Blueprint $table) {
-            //
-            $table->dropColumn('coupon_value');
-            $table->unsignedInteger('coupon_amount')->default(0)->comment('抵扣金额:分/折扣(100)');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('user_coupons', function (Blueprint $table) {
-            //
-        });
-    }
-}