From fffc0879c03fac083be7279147ec7839fe932360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Wed, 12 Jan 2022 21:36:20 +0800 Subject: [PATCH] Update --- app/Enums/DealerOrderSettleState.php | 9 +++++++++ app/Enums/DealerOrderStatus.php | 7 +++++++ app/Models/DealerOrder.php | 13 +++++++++++-- ...2022_01_12_165458_create_dealer_orders_table.php | 6 +++--- 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 app/Enums/DealerOrderSettleState.php create mode 100644 app/Enums/DealerOrderStatus.php diff --git a/app/Enums/DealerOrderSettleState.php b/app/Enums/DealerOrderSettleState.php new file mode 100644 index 00000000..08654fd7 --- /dev/null +++ b/app/Enums/DealerOrderSettleState.php @@ -0,0 +1,9 @@ + DealerOrderStatus::Pending, + 'settle_state' => DealerOrderSettleState::Pending, + ]; + + protected $casts = [ + 'status' => DealerOrderStatus::class, + 'settle_state' => DealerOrderSettleState::class, + ]; } diff --git a/database/migrations/2022_01_12_165458_create_dealer_orders_table.php b/database/migrations/2022_01_12_165458_create_dealer_orders_table.php index 6118ffbf..15339b4d 100644 --- a/database/migrations/2022_01_12_165458_create_dealer_orders_table.php +++ b/database/migrations/2022_01_12_165458_create_dealer_orders_table.php @@ -19,7 +19,7 @@ class CreateDealerOrdersTable extends Migration $table->unsignedBigInteger('user_id')->comment('下单用户'); $table->unsignedBigInteger('consignor_id')->nullable()->comment('发货用户'); $table->unsignedDecimal('total_amount', 10, 2)->default(0.00)->comment('订单价格'); - $table->unsignedTinyInteger('state')->default(0)->comment('状态:0待接单,1待打款,2待收款,3待发货,4待收货,5已完成,9已取消'); + $table->unsignedTinyInteger('status')->default(0)->comment('状态:0待接单,1待打款,2待收款,3待发货,4待收货,5已完成,9已取消'); $table->unsignedTinyInteger('settle_state')->default(0)->comment('结算状态:0待处理,1已生成,2已结算'); $table->string('consignee_name')->nullable()->comment('收货人姓名'); $table->string('consignee_telephone')->nullable()->comment('收货人联系方式'); @@ -33,8 +33,8 @@ class CreateDealerOrdersTable extends Migration $table->timestamp('shippinged_time')->nullable()->comment('确认收货时间'); $table->timestamps(); - $table->index(['user_id', 'state']); - $table->index('state'); + $table->index(['user_id', 'status']); + $table->index('status'); }); }