From a2d160de6b67b8f1e2d8c9d00534df2065c45d8c Mon Sep 17 00:00:00 2001 From: liapples Date: Mon, 11 Oct 2021 11:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E4=BB=B7->=E5=B8=82=E5=9C=BA=E4=BB=B7?= =?UTF-8?q?=EF=BC=9B=E7=8E=B0=E4=BB=B7(=E5=94=AE=E4=BB=B7)->=E9=94=80?= =?UTF-8?q?=E5=94=AE=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MySQL_change.sql | 16 ++++++++++++++++ .../Controllers/AgentProductController.php | 12 ++++++------ .../Controllers/GroupOrderController.php | 2 +- .../Controllers/MyBiddingProductController.php | 4 ++-- .../Controllers/MyDemandProductController.php | 4 ++-- .../Controllers/MyDemandProductController.php | 2 +- .../Controllers/MyBiddingProductController.php | 4 ++-- .../Controllers/MyDemandProductController.php | 4 ++-- .../Controllers/ProductController.php | 3 ++- resources/js/agent-spec-edit.js | 10 +++++----- resources/js/supplier-batch-add-spec.js | 12 +++++++++--- resources/lang/zh_CN/agent-product.php | 4 ++-- resources/lang/zh_CN/demand-product.php | 2 +- resources/lang/zh_CN/industry-product.php | 2 +- resources/lang/zh_CN/order.php | 2 +- resources/lang/zh_CN/product.php | 5 +++-- 16 files changed, 56 insertions(+), 32 deletions(-) diff --git a/MySQL_change.sql b/MySQL_change.sql index 63dd0d6..0e1a2ab 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -205,3 +205,19 @@ ENGINE=InnoDB; # 15:24 2021/10/9 ALTER TABLE `categories` DROP COLUMN `template`; + + + +# 11:10 2021/10/11 +ALTER TABLE `product_specs` + CHANGE COLUMN `original_price` `original_price` DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '市场价' AFTER `stock`, + CHANGE COLUMN `price` `price` DECIMAL(20,2) NOT NULL COMMENT '销售价' AFTER `original_price`, + ADD COLUMN `cost_price` DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '成本价' AFTER `price`; + +# 11:11 2021/10/11 修改注释 +ALTER TABLE `products` + CHANGE COLUMN `price` `price` DECIMAL(20,2) NOT NULL COMMENT '销售价' AFTER `title`, + CHANGE COLUMN `original_price` `original_price` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '市场价' AFTER `price`; +ALTER TABLE `agent_products` + CHANGE COLUMN `price` `price` DECIMAL(20,2) NOT NULL COMMENT '销售价' AFTER `product_ids`, + CHANGE COLUMN `original_price` `original_price` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '市场价' AFTER `price`; diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index d1922e0..1707402 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -62,7 +62,7 @@ class AgentProductController extends AdminController /*$grid->column('product_ids', '产品详情') ->display('查看') ->modal(function ($modal) { - $titles = ['供应商', '产品标题', '产品图片', '原价', '现价', '销量', '库存']; + $titles = ['供应商', '产品标题', '产品图片', '市场价', '现价', '销量', '库存']; $pic = isset($this->product->picture) ? "product->picture}\" style=\"max-width:80px;max-height:200px;cursor:pointer\" class=\"img img-thumbnail\">" : ''; @@ -220,8 +220,8 @@ class AgentProductController extends AdminController $form->text('stock', '您的库存')->required() //如果库存大于供应商库存，则取供应商库存 ->customFormat(fn() => isset($this->product_spec['stock'], $this->stock) && $this->stock > $this->product_spec['stock'] ? $this->product_spec['stock'] : $this->stock); - $form->text('original_price', '您的原价')->required(); - $form->text('price', '您的售价')->required(); + $form->text('original_price', '您的市场价')->required(); + $form->text('price', '您的销售价')->required(); Admin::style('.has-many-spec .add.btn{display:none;} .has-many-spec .field_date{width:100px!important;} .has-many-spec .col-md-12{padding:0;} @@ -436,7 +436,7 @@ class AgentProductController extends AdminController /*} else if ($product->stock < $form->stock) { return $form->response()->error("供应商当前库存为{$product->stock}，你设置的库存不能超过该数值");*/ } else if ($form->price < $product->price) { - return $form->response()->error("产品售价不能小于供应商售价{$product->price}"); + return $form->response()->error("产品销售价不能小于供应商销售价{$product->price}"); } $form->title = $product->title; $form->pictures = $product->pictures; @@ -477,7 +477,7 @@ class AgentProductController extends AdminController $total_price = Product::query()->whereIn('id', $product_ids)->sum('price'); if ($form->price < $total_price) { - return $form->response()->error("产品售价不能小于供应商产品总售价{$total_price}"); + return $form->response()->error("产品销售价不能小于供应商产品总销售价{$total_price}"); } //如果是计调版旅行社，标记为是云产品 @@ -511,7 +511,7 @@ class AgentProductController extends AdminController } else if ($cloud_product->stock < $form->stock) { return $form->response()->error("计调云产品当前库存为{$cloud_product->stock}，你设置的库存不能超过该数值"); } else if ($form->price < $cloud_product->price) { - return $form->response()->error("产品售价不能小于计调云产品售价{$cloud_product->price}"); + return $form->response()->error("产品销售价不能小于计调云产品销售价{$cloud_product->price}"); } //同步关键字段信息 diff --git a/app/AdminAgent/Controllers/GroupOrderController.php b/app/AdminAgent/Controllers/GroupOrderController.php index 8b8ef36..d305471 100644 --- a/app/AdminAgent/Controllers/GroupOrderController.php +++ b/app/AdminAgent/Controllers/GroupOrderController.php @@ -42,7 +42,7 @@ class GroupOrderController extends AdminController $grid->column('title'); $grid->column('picture')->image('', 60, 60); $grid->column('agent_cloud_pid', '产品ID'); - $grid->column('agent_cloud_price', '售价'); + $grid->column('agent_cloud_price', '销售价'); $grid->column('guide.name', '地接名称')->display(fn() => $this->guide->name); $grid->column('guide.contact_phone', '地接电话')->display(fn() => $this->guide->contact_phone); $grid->column('paid_at'); diff --git a/app/AdminAgent/Controllers/MyBiddingProductController.php b/app/AdminAgent/Controllers/MyBiddingProductController.php index 5a72e5e..fce00eb 100755 --- a/app/AdminAgent/Controllers/MyBiddingProductController.php +++ b/app/AdminAgent/Controllers/MyBiddingProductController.php @@ -41,8 +41,8 @@ class MyBiddingProductController extends AdminController $grid->column('product.category.name', '产品分类'); $grid->column('product.title','产品标题'); $grid->column('product.picture','产品图片')->image('', 60, 60); - $grid->column('product.price','产品售价'); - $grid->column('product.original_price','产品原价'); + $grid->column('product.price','产品销售价'); + $grid->column('product.original_price','产品市场价'); $grid->column('product.stock','产品库存'); $grid->column('product.sale','产品销量'); $grid->column('product.status','产品状态')->using(ProductStatus::array()); diff --git a/app/AdminAgent/Controllers/MyDemandProductController.php b/app/AdminAgent/Controllers/MyDemandProductController.php index 8e7441c..811db28 100755 --- a/app/AdminAgent/Controllers/MyDemandProductController.php +++ b/app/AdminAgent/Controllers/MyDemandProductController.php @@ -51,8 +51,8 @@ class MyDemandProductController extends AdminController $grid->column('product.category.name', '产品分类'); $grid->column('product.title','产品标题'); $grid->column('product.picture','产品图片')->image('', 60, 60); - $grid->column('product.price','产品售价'); - $grid->column('product.original_price','产品原价'); + $grid->column('product.price','产品销售价'); + $grid->column('product.original_price','产品市场价'); $grid->column('product.stock','产品库存'); $grid->column('product.sale','产品销量'); $grid->column('product.status','产品状态')->using(ProductStatus::array()); diff --git a/app/AdminGuide/Controllers/MyDemandProductController.php b/app/AdminGuide/Controllers/MyDemandProductController.php index ffeb391..134a75d 100755 --- a/app/AdminGuide/Controllers/MyDemandProductController.php +++ b/app/AdminGuide/Controllers/MyDemandProductController.php @@ -48,7 +48,7 @@ class MyDemandProductController extends AdminController $grid->column('agentProduct.picture', '产品图片')->image('', 60, 60); $grid->column('agentProduct.title', '产品名称')->limit(15); $grid->column('agentProduct.price','产品价格'); - $grid->column('agentProduct.original_price','产品原价'); + $grid->column('agentProduct.original_price','产品市场价'); $grid->column('agentProduct.sale','产品销量'); $grid->column('agentProduct.stock','产品库存'); diff --git a/app/AdminSupplier/Controllers/MyBiddingProductController.php b/app/AdminSupplier/Controllers/MyBiddingProductController.php index ab69f64..e12b3db 100755 --- a/app/AdminSupplier/Controllers/MyBiddingProductController.php +++ b/app/AdminSupplier/Controllers/MyBiddingProductController.php @@ -41,8 +41,8 @@ class MyBiddingProductController extends AdminController $grid->column('product.category.name', '产品分类'); $grid->column('product.title','产品标题'); $grid->column('product.picture','产品图片')->image('', 60, 60); - $grid->column('product.price','产品售价'); - $grid->column('product.original_price','产品原价'); + $grid->column('product.price','产品销售价'); + $grid->column('product.original_price','产品市场价'); $grid->column('product.stock','产品库存'); $grid->column('product.sale','产品销量'); $grid->column('product.status','产品状态')->using(ProductStatus::array()); diff --git a/app/AdminSupplier/Controllers/MyDemandProductController.php b/app/AdminSupplier/Controllers/MyDemandProductController.php index 8f42998..a4634ab 100755 --- a/app/AdminSupplier/Controllers/MyDemandProductController.php +++ b/app/AdminSupplier/Controllers/MyDemandProductController.php @@ -49,8 +49,8 @@ class MyDemandProductController extends AdminController $grid->column('product.category.name', '产品分类'); $grid->column('product.title','产品标题'); $grid->column('product.picture','产品图片')->image('', 60, 60); - $grid->column('product.price','产品售价'); - $grid->column('product.original_price','产品原价'); + $grid->column('product.price','产品销售价'); + $grid->column('product.original_price','产品市场价'); $grid->column('product.stock','产品库存'); $grid->column('product.sale','产品销量'); $grid->column('product.status','产品状态')->using(ProductStatus::array()); diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 8fac9d7..20c64f3 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -139,6 +139,7 @@ class ProductController extends AdminController $form->text('stock')->required(); $form->text('original_price')->required(); $form->text('price')->required(); + $form->text('cost_price')->required(); Admin::style('.field_date{width:100px!important;} .has-many-spec .col-md-12{padding:0;} .has-many-spec .add.btn{display:none;} @@ -290,7 +291,7 @@ class ProductController extends AdminController return $form->response()->error('请输入产品规格'); } - //处理库存、原价、售价 + //处理库存、市场价、销售价 $form->hidden(['stock', 'original_price', 'price']); $form->stock = array_sum(array_column($spec, 'stock')); $form->original_price = min(array_column($spec, 'original_price')); diff --git a/resources/js/agent-spec-edit.js b/resources/js/agent-spec-edit.js index 14f137d..3fda5e9 100644 --- a/resources/js/agent-spec-edit.js +++ b/resources/js/agent-spec-edit.js @@ -1,6 +1,6 @@ $(function () { $('.has-many-spec .add.btn') - .after('
 同步供应商最新规格
 批量设置库存
 批量设置原价
 批量设置售价
'); + .after('
 同步供应商最新规格
 批量设置库存
 批量设置市场价
 批量设置销售价
'); //同步最新规格 var template = $('template.spec-tpl').html(); @@ -74,9 +74,9 @@ $(function () { }); }); - //批量设置原价 + //批量设置市场价 $('.batch-original-price').click(function () { - var num = prompt('请输入加价金额（在供应商售价基础上加）'); + var num = prompt('请输入加价金额（在供应商销售价基础上加）'); if (!/^\d+$/.test(num)) { return; } @@ -88,9 +88,9 @@ $(function () { }); }); - //批量售价 + //批量销售价 $('.batch-price').click(function () { - var num = prompt('请输入加价金额（在供应商售价基础上加）'); + var num = prompt('请输入加价金额（在供应商销售价基础上加）'); if (!/^\d+$/.test(num)) { return; } diff --git a/resources/js/supplier-batch-add-spec.js b/resources/js/supplier-batch-add-spec.js index 187c6ea..c1bcedd 100644 --- a/resources/js/supplier-batch-add-spec.js +++ b/resources/js/supplier-batch-add-spec.js @@ -50,16 +50,21 @@ $(function () { return; } - var original_price = prompt('请输入默认原价'); + var original_price = prompt('请输入默认市场价'); if (!original_price) { return; } - var price = prompt('请输入默认售价'); + var price = prompt('请输入默认销售价'); if (!price) { return; } + var cost_price = prompt('请输入默认成本价'); + if (!cost_price) { + return; + } + $('template.spec-tpl .field_name').prop('value', name); var html = $('template.spec-tpl').html(); @@ -68,7 +73,8 @@ $(function () { 'date': date, 'stock': stock, 'original_price': original_price, - 'price': price + 'price': price, + 'cost_price': cost_price, }; for (var key in fields) { html = html.replace('name="spec[new___LA_KEY__][' + key + ']" value=""', 'name="spec[new___LA_KEY__][' + key + ']" value="' + fields[key] + '"'); diff --git a/resources/lang/zh_CN/agent-product.php b/resources/lang/zh_CN/agent-product.php index 6c8c9a1..5d98966 100644 --- a/resources/lang/zh_CN/agent-product.php +++ b/resources/lang/zh_CN/agent-product.php @@ -8,8 +8,8 @@ return [ 'fields' => [ 'agent_id' => '代理商ID', 'product_id' => '供应商产品ID', - 'price' => '售价', - 'original_price' => '原价', + 'price' => '销售价', + 'original_price' => '市场价', 'sale' => '销量', 'stock' => '库存', 'channel_id' => '频道', diff --git a/resources/lang/zh_CN/demand-product.php b/resources/lang/zh_CN/demand-product.php index 4b56122..74de3be 100755 --- a/resources/lang/zh_CN/demand-product.php +++ b/resources/lang/zh_CN/demand-product.php @@ -11,7 +11,7 @@ return [ 'category_id' => '产品分类ID', 'content' => '产品详情', 'know' => '旅客须知', - 'original_price' => '原价', + 'original_price' => '市场价', 'picture' => '产品图片', 'pictures' => '产品图片', 'price' => '价格', diff --git a/resources/lang/zh_CN/industry-product.php b/resources/lang/zh_CN/industry-product.php index 9888880..211529e 100644 --- a/resources/lang/zh_CN/industry-product.php +++ b/resources/lang/zh_CN/industry-product.php @@ -13,7 +13,7 @@ return [ 'pictures' => '产品图片', 'picture' => '产品图片', 'price' => '售价', - 'original_price' => '原价', + 'original_price' => '市场价', 'stock' => '库存量', 'sale' => '销量', 'status' => '状态', diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php index aa057da..9728d05 100644 --- a/resources/lang/zh_CN/order.php +++ b/resources/lang/zh_CN/order.php @@ -25,7 +25,7 @@ return [ 'title' => '产品名称', 'user_id' => '用户ID', 'agent_cloud_pid' => '计调云产品ID', - 'agent_cloud_price' => '计调云产品售价', + 'agent_cloud_price' => '计调云产品销售价', 'timeout' => '超时时间', 'created_at' => '下单时间', ], diff --git a/resources/lang/zh_CN/product.php b/resources/lang/zh_CN/product.php index 148c638..b0b7af3 100644 --- a/resources/lang/zh_CN/product.php +++ b/resources/lang/zh_CN/product.php @@ -8,10 +8,11 @@ return [ 'category_id' => '产品分类ID', 'content' => '产品详情', 'know' => '旅游须知', - 'original_price' => '原价', + 'original_price' => '市场价', 'pictures' => '产品图片', 'picture' => '产品图片', - 'price' => '售价', + 'price' => '销售价', + 'cost_price' => '成本价', 'sale' => '销量', 'service_persons' => '单库存服务用户数', 'status' => '状态',