From 47514c610f88ddfde7f6ae5381fa913eedca463f Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Mon, 7 Aug 2023 13:41:37 +0900 Subject: [PATCH] =?UTF-8?q?=E9=A0=98=E5=8F=8E=E8=A8=BC=E7=99=BA=E8=A1=8C?= =?UTF-8?q?=E4=BE=9D=E9=A0=BC=E3=81=AE=E9=80=A3=E7=95=AA=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReceiptIssuingOrderManager.php | 25 +------- ...eceipt_issuing_order_seq_numbers_table.php | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 database/migrations/2023_08_07_131800_remove_receipt_issuing_order_seq_numbers_table.php diff --git a/app/Logic/ReceiptIssuingOrder/ReceiptIssuingOrderManager.php b/app/Logic/ReceiptIssuingOrder/ReceiptIssuingOrderManager.php index f7351fd..86d4248 100644 --- a/app/Logic/ReceiptIssuingOrder/ReceiptIssuingOrderManager.php +++ b/app/Logic/ReceiptIssuingOrder/ReceiptIssuingOrderManager.php @@ -2,16 +2,11 @@ namespace App\Logic\ReceiptIssuingOrder; -use App\Events\ReceiptIssuingOrder\ChangeHandlerEvent; -use App\Events\ReceiptIssuingOrder\ConfirmedEvent; -use App\Events\ReceiptIssuingOrder\MailOrderEvent; use App\Exceptions\AppCommonException; use App\Exceptions\ExclusiveException; use App\Features\InstanceAble; use App\Features\LoginUser; use App\Models\ReceiptIssuingOrder; -use App\Models\ReceiptIssuingOrderSeqNumber; -use App\Models\User; use App\Util\DateUtil; use Illuminate\Support\Carbon; use Illuminate\Support\Str; @@ -201,28 +196,10 @@ abstract class ReceiptIssuingOrderManager return $this; } - protected function fillSeqNumber(): static - { - if ($this->order->seq_number !== null) { - return $this; - } - - $seq = ReceiptIssuingOrderSeqNumber::lockForUpdate()->first(); - if (!($seq instanceof ReceiptIssuingOrderSeqNumber)) { - throw new AppCommonException("通番取得失敗"); - } - $seq->seq_number++; - $this->order->seq_number = $seq->seq_number; - $seq->save(); - - return $this; - } - protected function save(): static { $this->setStatus() - ->updateCheck() - ->fillSeqNumber(); + ->updateCheck(); $this->order->save(); return $this; diff --git a/database/migrations/2023_08_07_131800_remove_receipt_issuing_order_seq_numbers_table.php b/database/migrations/2023_08_07_131800_remove_receipt_issuing_order_seq_numbers_table.php new file mode 100644 index 0000000..f6bf356 --- /dev/null +++ b/database/migrations/2023_08_07_131800_remove_receipt_issuing_order_seq_numbers_table.php @@ -0,0 +1,57 @@ +dropColumn("seq_number"); + }); + Schema::table('receipt_issuing_order_histories', function (Blueprint $table) { + $table->dropColumn("seq_number"); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + MigrationHelper::createTable('receipt_issuing_order_seq_numbers', $this->schema()); + + ReceiptIssuingOrderSeqNumber::create([ + ReceiptIssuingOrderSeqNumber::COL_NAME_SEQ_NUMBER => 0, + ]); + + Schema::table('receipt_issuing_orders', function (Blueprint $table) { + $table->bigInteger("seq_number", false, true)->nullable()->comment("通番"); + }); + Schema::table('receipt_issuing_order_histories', function (Blueprint $table) { + $table->bigInteger("seq_number", false, true)->nullable()->comment("通番"); + }); + } + + private function schema() + { + + return function (Blueprint $table, MigrationHelper $helper) { + $helper->baseColumn(); + $table->string('seq_number')->comment("通番"); + }; + } +};