From bbe64536f77986ebd3dfde6f6f154baaafb76a2c Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 31 Aug 2022 15:57:01 +0800
Subject: [PATCH] order remove merchant_id

---
 composer.json                                 | 17 ++++++++--
 .../2022_08_15_083640_create_orders_table.php |  1 -
 src/Models/Order.php                          | 32 +------------------
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/composer.json b/composer.json
index 773535b..bc5f594 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,10 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": "^8.0.2",
         "peidikeji/dcat-admin": "*",
-        "tucker-eric/eloquentfilter": "^3.1",
-        "laravel/framework": "^9.0"
+        "laravel/framework": "^9.0",
+        "peidikeji/dcat-admin-user": "dev-master"
     },
     "autoload": {
         "psr-4": {
@@ -29,5 +29,16 @@
                 "Peidikeji\\Order\\OrderServiceProvider"
             ]
         }
+    },
+    "minimum-stability": "dev",
+    "repositories": {
+        "peidikeji/dcat-admin": {
+            "type": "git",
+            "url": "git@gitea.peidikeji.cn:dcat-admin/dcat-admin.git"
+        },
+        "peidikeji/dcat-admin-user": {
+            "type": "git",
+            "url": "git@gitea.peidikeji.cn:dcat-admin/dcat-admin-user.git"
+        }
     }
 }
diff --git a/database/2022_08_15_083640_create_orders_table.php b/database/2022_08_15_083640_create_orders_table.php
index 519a465..be2ccc8 100644
--- a/database/2022_08_15_083640_create_orders_table.php
+++ b/database/2022_08_15_083640_create_orders_table.php
@@ -16,7 +16,6 @@ return new class extends Migration
         Schema::create('orders', function (Blueprint $table) {
             $table->id('id');
             $table->string('sn')->comment('订单号');
-            $table->unsignedBigInteger('merchant_id')->nullable()->comment('商户ID');
             $table->unsignedBigInteger('user_id')->comment('下单用户, 关联 users.id');
             $table->decimal('total_money', 12, 2)->default(0)->comment('总金额');
 
diff --git a/src/Models/Order.php b/src/Models/Order.php
index f3f5d26..effc670 100644
--- a/src/Models/Order.php
+++ b/src/Models/Order.php
@@ -5,9 +5,6 @@ namespace Peidikeji\Order\Models;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Storage;
-use Overtrue\LaravelWeChat\EasyWeChat;
-use Peidikeji\Merchant\Models\Merchant;
 use Peidikeji\Order\Enums\RefundStatus;
 use Peidikeji\Order\Enums\OrderScene;
 use Peidikeji\Order\Enums\OrderStatus;
@@ -18,7 +15,6 @@ use Peidikeji\Order\Enums\ShipWay;
 use Peidikeji\Order\Exceptions\OrderException;
 use Peidikeji\Order\Filters\OrderFilter;
 use Peidikeji\User\Models\User;
-use SimpleSoftwareIO\QrCode\Facades\QrCode;
 
 class Order extends Model
 {
@@ -26,7 +22,7 @@ class Order extends Model
     use Filterable;
 
     protected $fillable = [
-        'merchant_id', 'user_id',
+        'user_id',
         'total_money', 'sn',
         'pay_at', 'pay_money', 'pay_no', 'pay_status', 'pay_way',
         'score_discount_amount', 'score_discount_money', 'score_discount_ratio',
@@ -60,11 +56,6 @@ class Order extends Model
         return $this->belongsTo(User::class, 'user_id');
     }
 
-    public function merchant()
-    {
-        return $this->belongsTo(Merchant::class, 'merchant_id');
-    }
-
     public function goods()
     {
         return $this->hasMany(OrderGoods::class, 'order_id');
@@ -215,27 +206,6 @@ class Order extends Model
         return true;
     }
 
-    public function generateShipQrcode()
-    {
-        $extra = $this->extra ?: [];
-        $url = data_get($extra, 'ship_qrcode');
-        if (!$url) {
-            $disk = Storage::disk('public');
-            $path = 'order/qrcode/'.$this->id.'.svg';
-            $result = QrCode::generate(json_encode([
-                'type' => 'ship',
-                'order_id' => $this->id
-            ]));
-            $disk->put($path, $result);
-
-            $url = $disk->url($path);
-
-            $extra['ship_qrcode'] = $url;
-            $this->update(['extra' => $extra]);
-        }
-        return $url;
-    }
-
     public function scopeSort($q)
     {
         return $q->orderBy('created_at', 'desc');