diff --git a/MySQL_change.sql b/MySQL_change.sql index 3fbc3c9..263f655 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -123,3 +123,10 @@ ALTER TABLE `product_specs` UPDATE `product_specs` SET `date` = NOW(); ALTER TABLE `product_specs` CHANGE COLUMN `date` `date` DATE NOT NULL COMMENT '日期' AFTER `name`; + + + +# 10:39 2021/9/26 +ALTER TABLE `agent_product_specs` + DROP COLUMN `name`, + DROP COLUMN `date`; diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index a369e8f..286571b 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -212,8 +212,8 @@ class AgentProductController extends AdminController $form->hasMany('spec', function (Form\NestedForm $form) { $form->hidden('id'); $form->hidden('product_spec_id'); - $form->text('name', '规格')->readOnly(); - $form->date('date', '日期')->readOnly(); + $form->text('supplier_name', '规格')->disable()->customFormat(fn() => $this->product_spec['name'] ?? '已删除规格'); + $form->date('supplier_date', '日期')->disable()->customFormat(fn() => $this->product_spec['date'] ?? '已删除规格'); $form->text('supplier_stock', '供应商库存')->disable()->customFormat(fn() => $this->product_spec['stock'] ?? 0); $form->text('supplier_price', '供应商价')->disable()->customFormat(fn() => $this->product_spec['price'] ?? 0); $form->text('stock', '您的库存')->customFormat(fn() => isset($this->product_spec['stock'], $this->stock) && $this->stock > $this->product_spec['stock'] ? $this->product_spec['stock'] : $this->stock); diff --git a/app/Http/Controllers/Api/AgentProductController.php b/app/Http/Controllers/Api/AgentProductController.php index dd202ce..c43ad15 100644 --- a/app/Http/Controllers/Api/AgentProductController.php +++ b/app/Http/Controllers/Api/AgentProductController.php @@ -64,7 +64,7 @@ class AgentProductController extends Controller } else { $where = ['id' => $id, 'agent_id' => $this->agent_id, 'status' => ProductStatus::ON_SALE]; } - $agent_product = AgentProduct::with(['coupon:tag,agent_product_id', 'product:id,type,extends', 'spec:id,agent_product_id,name,date,stock,original_price,price']) + $agent_product = AgentProduct::with(['coupon:tag,agent_product_id', 'product:id,type,extends', 'spec.productSpec:id,name,date']) ->whereDoesntHave('agentProductItem', function ($query) { return $query->whereHas('product', function ($query) { return $query->where('stock', '<=', 0)->orWhere('status', '<>', ProductStatus::ON_SALE);