pdkj
/
dcat-admin-order
4
0
Fork 0
Code Releases Activity

order remove merchant_id

master
panliang 2022-08-31 15:57:01 +08:00
parent d94fd2b3eb
commit bbe64536f7
3 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
composer.json
View File

@ -13,10 +13,10 @@
} }
], ],
"require": { "require": {
"php": ">=7.1.0", "php": "^8.0.2",
"peidikeji/dcat-admin": "*", "peidikeji/dcat-admin": "*",
"tucker-eric/eloquentfilter": "^3.1", "laravel/framework": "^9.0",
"laravel/framework": "^9.0" "peidikeji/dcat-admin-user": "dev-master"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -29,5 +29,16 @@
"Peidikeji\\Order\\OrderServiceProvider" "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"
}
} }
} }

1
database/2022_08_15_083640_create_orders_table.php
View File

@ -16,7 +16,6 @@ return new class extends Migration
Schema::create('orders', function (Blueprint $table) { Schema::create('orders', function (Blueprint $table) {
$table->id('id'); $table->id('id');
$table->string('sn')->comment('订单号'); $table->string('sn')->comment('订单号');
$table->unsignedBigInteger('merchant_id')->nullable()->comment('商户ID');
$table->unsignedBigInteger('user_id')->comment('下单用户, 关联 users.id'); $table->unsignedBigInteger('user_id')->comment('下单用户, 关联 users.id');
$table->decimal('total_money', 12, 2)->default(0)->comment('总金额'); $table->decimal('total_money', 12, 2)->default(0)->comment('总金额');

32
src/Models/Order.php
View File

@ -5,9 +5,6 @@ namespace Peidikeji\Order\Models;
use Dcat\Admin\Traits\HasDateTimeFormatter; use Dcat\Admin\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable; use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Model; 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\RefundStatus;
use Peidikeji\Order\Enums\OrderScene; use Peidikeji\Order\Enums\OrderScene;
use Peidikeji\Order\Enums\OrderStatus; use Peidikeji\Order\Enums\OrderStatus;
@ -18,7 +15,6 @@ use Peidikeji\Order\Enums\ShipWay;
use Peidikeji\Order\Exceptions\OrderException; use Peidikeji\Order\Exceptions\OrderException;
use Peidikeji\Order\Filters\OrderFilter; use Peidikeji\Order\Filters\OrderFilter;
use Peidikeji\User\Models\User; use Peidikeji\User\Models\User;
use SimpleSoftwareIO\QrCode\Facades\QrCode;
class Order extends Model class Order extends Model
{ {
@ -26,7 +22,7 @@ class Order extends Model
use Filterable; use Filterable;
protected $fillable = [ protected $fillable = [
'merchant_id', 'user_id', 'user_id',
'total_money', 'sn', 'total_money', 'sn',
'pay_at', 'pay_money', 'pay_no', 'pay_status', 'pay_way', 'pay_at', 'pay_money', 'pay_no', 'pay_status', 'pay_way',
'score_discount_amount', 'score_discount_money', 'score_discount_ratio', 'score_discount_amount', 'score_discount_money', 'score_discount_ratio',
@ -60,11 +56,6 @@ class Order extends Model
return $this->belongsTo(User::class, 'user_id'); return $this->belongsTo(User::class, 'user_id');
} }
public function merchant()
{
return $this->belongsTo(Merchant::class, 'merchant_id');
}
public function goods() public function goods()
{ {
return $this->hasMany(OrderGoods::class, 'order_id'); return $this->hasMany(OrderGoods::class, 'order_id');
@ -215,27 +206,6 @@ class Order extends Model
return true; 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) public function scopeSort($q)
{ {
return $q->orderBy('created_at', 'desc'); return $q->orderBy('created_at', 'desc');