diff --git a/beike/Models/Order.php b/beike/Models/Order.php index 42c24c76..25976aec 100644 --- a/beike/Models/Order.php +++ b/beike/Models/Order.php @@ -19,9 +19,9 @@ class Order extends Base 'number', 'customer_id', 'customer_group_id', 'shipping_address_id', 'payment_address_id', 'customer_name', 'email', 'calling_code', 'telephone', 'total', 'locale', 'currency_code', 'currency_value', 'ip', 'user_agent', 'status', 'shipping_method_code', 'shipping_method_name', 'shipping_customer_name', 'shipping_calling_code', - 'shipping_telephone', 'shipping_country', 'shipping_zone', 'shipping_city', 'shipping_address_1', + 'shipping_telephone', 'shipping_country', 'shipping_country_id', 'shipping_zone', 'shipping_zone_id', 'shipping_city', 'shipping_address_1', 'shipping_zipcode', 'shipping_address_2', 'payment_method_code', 'payment_method_name', 'payment_customer_name', - 'payment_calling_code', 'payment_telephone', 'payment_country', 'payment_zone', 'payment_city', + 'payment_calling_code', 'payment_telephone', 'payment_country', 'payment_country_id', 'payment_zone', 'payment_zone_id', 'payment_city', 'payment_address_1', 'payment_address_2', 'payment_zipcode', ]; diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index 3d250fcb..98a62f62 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -211,7 +211,9 @@ class OrderRepo 'shipping_calling_code' => $shippingAddress->calling_code ?? 0, 'shipping_telephone' => $shippingAddress->phone ?? '', 'shipping_country' => $shippingAddress->country->name ?? '', + 'shipping_country_id' => $shippingAddress->country->id ?? 0, 'shipping_zone' => $shippingAddress->zone, + 'shipping_zone_id' => $shippingAddress->zone_id ?? 0, 'shipping_city' => $shippingAddress->city, 'shipping_address_1' => $shippingAddress->address_1, 'shipping_address_2' => $shippingAddress->address_2, @@ -222,7 +224,9 @@ class OrderRepo 'payment_calling_code' => $paymentAddress->calling_code ?? 0, 'payment_telephone' => $paymentAddress->phone ?? '', 'payment_country' => $paymentAddress->country->name ?? '', + 'payment_country_id' => $paymentAddress->country->id ?? 0, 'payment_zone' => $paymentAddress->zone, + 'payment_zone_id' => $paymentAddress->zone_id ?? 0, 'payment_city' => $paymentAddress->city, 'payment_address_1' => $paymentAddress->address_1, 'payment_address_2' => $paymentAddress->address_2, diff --git a/database/migrations/2022_12_22_061843_order_add_field.php b/database/migrations/2022_12_22_061843_order_add_field.php new file mode 100644 index 00000000..c58b98af --- /dev/null +++ b/database/migrations/2022_12_22_061843_order_add_field.php @@ -0,0 +1,35 @@ +unsignedInteger('shipping_country_id')->after('shipping_country')->comment('国家id'); + $table->unsignedInteger('shipping_zone_id')->after('shipping_country_id')->comment('省份ID'); + $table->unsignedInteger('payment_country_id')->after('payment_country')->comment('国家id'); + $table->unsignedInteger('payment_zone_id')->after('payment_country_id')->comment('省份ID'); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +};