From 1c9f9818911832e121b95245acd8577bbb0d9420 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Tue, 26 Jul 2022 21:18:42 +0800 Subject: [PATCH] tax rules --- beike/Admin/Http/Controllers/TaxClassController.php | 2 +- beike/Admin/Repositories/TaxClassRepo.php | 4 ++-- beike/Models/TaxClass.php | 2 ++ beike/Models/TaxRate.php | 2 ++ beike/Models/TaxRule.php | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/beike/Admin/Http/Controllers/TaxClassController.php b/beike/Admin/Http/Controllers/TaxClassController.php index d09d9960..61dc76ea 100644 --- a/beike/Admin/Http/Controllers/TaxClassController.php +++ b/beike/Admin/Http/Controllers/TaxClassController.php @@ -38,7 +38,7 @@ class TaxClassController extends Controller public function store(Request $request) { - $requestData = json_decode($request->getContent()); + $requestData = json_decode($request->getContent(), true); TaxClassRepo::createOrUpdate($requestData); return json_success('保存成功'); } diff --git a/beike/Admin/Repositories/TaxClassRepo.php b/beike/Admin/Repositories/TaxClassRepo.php index 13093847..6fbc16a0 100644 --- a/beike/Admin/Repositories/TaxClassRepo.php +++ b/beike/Admin/Repositories/TaxClassRepo.php @@ -29,7 +29,7 @@ class TaxClassRepo ]); $taxClass->saveOrFail(); - $taxClass->taxRates()->delete(); - $taxClass->taxRates()->createMany($data['rates']); + $taxClass->taxRules()->delete(); + $taxClass->taxRules()->createMany($data['rules']); } } diff --git a/beike/Models/TaxClass.php b/beike/Models/TaxClass.php index a908feae..e742f05e 100644 --- a/beike/Models/TaxClass.php +++ b/beike/Models/TaxClass.php @@ -13,6 +13,8 @@ namespace Beike\Models; class TaxClass extends Base { + protected $fillable = ['title', 'description']; + public function taxRates() { return $this->belongsToMany(TaxRate::class, 'tax_rules'); diff --git a/beike/Models/TaxRate.php b/beike/Models/TaxRate.php index e658510e..ad6fc67e 100644 --- a/beike/Models/TaxRate.php +++ b/beike/Models/TaxRate.php @@ -15,6 +15,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class TaxRate extends Base { + protected $fillable = ['title', 'description']; + public function region(): BelongsTo { return $this->belongsTo(Region::class); diff --git a/beike/Models/TaxRule.php b/beike/Models/TaxRule.php index 3f6e1752..57c0d638 100644 --- a/beike/Models/TaxRule.php +++ b/beike/Models/TaxRule.php @@ -15,6 +15,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class TaxRule extends Base { + protected $fillable = ['tax_class_id', 'tax_rate_id', 'based']; + public function taxClass(): BelongsTo { return $this->belongsTo(TaxClass::class);