diff --git a/MySQL_change.sql b/MySQL_change.sql index 4883370..868bd5c 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -393,3 +393,15 @@ ALTER TABLE `orders` ALTER TABLE `industry_orders` ADD COLUMN `audit_status` TINYINT NOT NULL DEFAULT 0 COMMENT '审核状态,-1拒绝,0待审核,1通过' AFTER `info`, ADD COLUMN `audit_opinion` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '审核不通过原因' AFTER `audit_status`; + + + +# 23:45 ‎2021/‎10/‎28 +ALTER TABLE `products` + CHANGE COLUMN `logitude` `longitude` DECIMAL(20,14) NOT NULL DEFAULT '0.00000000000000' COMMENT '经度' AFTER `diy_form_id`; +ALTER TABLE `collect_products` + CHANGE COLUMN `logitude` `longitude` DECIMAL(20,14) NOT NULL DEFAULT '0.00000000000000' COMMENT '经度' AFTER `diy_form_id`; + +ALTER ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_agent_products` AS select `agent_products`.`id` AS `id`,`agent_products`.`agent_id` AS `agent_id`,`agent_products`.`product_id` AS `product_id`,`agent_products`.`product_ids` AS `product_ids`,`agent_products`.`price` AS `price`,`agent_products`.`original_price` AS `original_price`,`agent_products`.`sale` AS `sale`,`agent_products`.`stock` AS `stock`,`agent_products`.`channel_id` AS `channel_id`,`agent_products`.`category_id` AS `category_id`,`agent_products`.`guide_id` AS `guide_id`,`agent_products`.`guide_price` AS `guide_price`,`agent_products`.`status` AS `status`,`agent_products`.`verifier` AS `verifier`,`agent_products`.`is_rec` AS `is_rec`,`agent_products`.`type` AS `type`,`agent_products`.`title` AS `title`,`agent_products`.`pictures` AS `pictures`,`agent_products`.`know` AS `know`,`agent_products`.`content` AS `content`,`agent_products`.`deposit` AS `deposit`,`agent_products`.`deposit_timeout` AS `deposit_timeout`,`agent_products`.`earnest` AS `earnest`,`agent_products`.`earnest_timeout` AS `earnest_timeout`,`agent_products`.`is_cloud` AS `is_cloud`,`agent_products`.`agent_cloud_pid` AS `agent_cloud_pid`,`agent_products`.`created_at` AS `created_at`,`agent_products`.`updated_at` AS `updated_at`,`agent_products`.`deleted_at` AS `deleted_at`,`products`.`latitude` AS `latitude`,`products`.`longitude` AS `longitude`,`products`.`address` AS `address` from (`agent_products` join `products` on((`agent_products`.`product_id` = `products`.`id`))) ; + + diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 799391a..13c7138 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -326,7 +326,7 @@ class ProductController extends AdminController return $form->response()->error('请输入产品规格'); } - $form->hidden(['stock', 'original_price', 'price', 'logitude', 'latitude', 'address']); + $form->hidden(['stock', 'original_price', 'price', 'longitude', 'latitude', 'address']); //处理库存、市场价、销售价 $form->stock = array_sum(array_column($spec, 'stock')); @@ -335,11 +335,11 @@ class ProductController extends AdminController //经度,纬度,地址 if ($form->type == 0) { //旅游线路用出发地保存 - $form->logitude = $form->extends['field_0_departure_place_longitude'] ?? 0; + $form->longitude = $form->extends['field_0_departure_place_longitude'] ?? 0; $form->latitude = $form->extends['field_0_departure_place_latitude'] ?? 0; $form->address = $form->extends['field_0_departure_place'] ?? ''; } else { - $form->logitude = $form->extends['field_'.$form->type.'_longitude'] ?? 0; + $form->longitude = $form->extends['field_'.$form->type.'_longitude'] ?? 0; $form->latitude = $form->extends['field_'.$form->type.'_latitude'] ?? 0; $form->address = $form->extends['field_'.$form->type.'_address'] ?? ''; } diff --git a/app/Console/Commands/Collector.php b/app/Console/Commands/Collector.php index f696061..8ec098b 100644 --- a/app/Console/Commands/Collector.php +++ b/app/Console/Commands/Collector.php @@ -178,7 +178,7 @@ class Collector extends Command 'know' => $know, 'content' => $guide_info['intro'] ?? '', 'extends' => $extends, - 'logitude' => $base_info['lng'] ?? 0, + 'longitude' => $base_info['lng'] ?? 0, 'latitude' => $base_info['lat'] ?? 0, 'address' => $base_info['address'] ?? '', ]); @@ -269,7 +269,7 @@ class Collector extends Command 'know' => $know, 'content' => $content, 'extends' => $extends, - 'logitude' => 0, + 'longitude' => 0, 'latitude' => 0, 'address' => '', ]); diff --git a/app/Http/Controllers/Api/AgentProductController.php b/app/Http/Controllers/Api/AgentProductController.php index d2697e1..9e241d1 100644 --- a/app/Http/Controllers/Api/AgentProductController.php +++ b/app/Http/Controllers/Api/AgentProductController.php @@ -34,7 +34,7 @@ class AgentProductController extends Controller } // 距离排序,TODO 优化 - $list = $list->addSelect('latitude', 'logitude', 'address', DB::raw(<<addSelect('latitude', 'longitude', 'address', DB::raw(<<