From fed3913bf97d3fec8546750de5b97696d9592923 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Thu, 12 Aug 2021 11:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86OrderStatus=E5=91=BD=E5=90=8D=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9=E4=B8=BACommon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/OrderController.php           | 2 +-
 app/{Service => Common}/OrderStatus.php             | 2 +-
 app/Http/Controllers/Api/OrderController.php        | 2 +-
 app/Http/Controllers/Api/VerificationController.php | 2 +-
 app/Http/Controllers/Api/WxpayController.php        | 2 +-
 app/Models/Order.php                                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename app/{Service => Common}/OrderStatus.php (97%)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 6d40ead..b3b4369 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -5,7 +5,7 @@ namespace App\Admin\Controllers;
 use App\Admin\Repositories\Order;
 use App\Models\Agent;
 use App\Models\Supplier;
-use App\Service\OrderStatus;
+use App\Common\OrderStatus;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
diff --git a/app/Service/OrderStatus.php b/app/Common/OrderStatus.php
similarity index 97%
rename from app/Service/OrderStatus.php
rename to app/Common/OrderStatus.php
index 3fd511d..a12c34d 100644
--- a/app/Service/OrderStatus.php
+++ b/app/Common/OrderStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service;
+namespace App\Common;
 
 /**
  * 订单状态码
diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php
index 09eb090..2cf3a6d 100644
--- a/app/Http/Controllers/Api/OrderController.php
+++ b/app/Http/Controllers/Api/OrderController.php
@@ -15,7 +15,7 @@ use EasyWeChat\Kernel\Exceptions\InvalidConfigException;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use App\Service\OrderStatus as Status;
+use App\Common\OrderStatus as Status;
 
 /**
  * 订单
diff --git a/app/Http/Controllers/Api/VerificationController.php b/app/Http/Controllers/Api/VerificationController.php
index 60b4628..a85722a 100644
--- a/app/Http/Controllers/Api/VerificationController.php
+++ b/app/Http/Controllers/Api/VerificationController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Models\Order;
 use App\Models\User;
-use App\Service\OrderStatus;
+use App\Common\OrderStatus;
 
 class VerificationController extends Controller
 {
diff --git a/app/Http/Controllers/Api/WxpayController.php b/app/Http/Controllers/Api/WxpayController.php
index 9777f91..1579e27 100644
--- a/app/Http/Controllers/Api/WxpayController.php
+++ b/app/Http/Controllers/Api/WxpayController.php
@@ -10,7 +10,7 @@ use EasyWeChat\Factory;
 use EasyWeChat\Kernel\Exceptions\Exception;
 use EasyWeChat\Payment\Kernel\Exceptions\InvalidSignException;
 use Illuminate\Support\Facades\DB;
-use App\Service\OrderStatus;
+use App\Common\OrderStatus;
 
 class WxpayController
 {
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 1b76266..3b6fbe0 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -4,7 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Service\OrderStatus as Status;
+use App\Common\OrderStatus as Status;
 
 class Order extends BaseModel
 {