Browse Source

修改注释

master
李可松 4 years ago
parent
commit
ec3476fcd4
  1. 26
      app/AdminAgent/Controllers/AgentProductController.php
  2. 2
      app/AdminAgent/Renderable/SelectAgentCloudProduct.php
  3. 2
      app/Http/Controllers/Api/AgentProductController.php
  4. 2
      app/Models/Order.php
  5. 4
      resources/lang/zh_CN/order.php

26
app/AdminAgent/Controllers/AgentProductController.php

@ -177,7 +177,7 @@ class AgentProductController extends AdminController
$form->display('id'); $form->display('id');
//组团版旅行社不允许选择组团云产品
//计调版旅行社不允许选择计调云产品
if (Admin::user()->type == AgentType::CLUSTER) { if (Admin::user()->type == AgentType::CLUSTER) {
$form->hidden('product_id')->value(0)->default(0); $form->hidden('product_id')->value(0)->default(0);
$form->hidden('type')->value(1)->default(1); $form->hidden('type')->value(1)->default(1);
@ -196,7 +196,7 @@ class AgentProductController extends AdminController
$form->editor('content'); $form->editor('content');
} else { } else {
$form->radio('type') $form->radio('type')
->options(['单品销售', '组合销售', '组团云产品'])
->options(['单品销售', '组合销售', '计调云产品'])
->default(Admin::user()->type == AgentType::CLUSTER ? 1 : 0)->required() ->default(Admin::user()->type == AgentType::CLUSTER ? 1 : 0)->required()
->help('单品销售无需审核,组合销售需要审核才能上架') ->help('单品销售无需审核,组合销售需要审核才能上架')
->when(0, function (Form $form) { ->when(0, function (Form $form) {
@ -222,8 +222,8 @@ class AgentProductController extends AdminController
$form->editor('know'); $form->editor('know');
$form->editor('content'); $form->editor('content');
})->when(2, function (Form $form) { })->when(2, function (Form $form) {
/** 组团云产品 **/
$form->selectTable('agent_cloud_pid', '组团云产品')
/** 计调云产品 **/
$form->selectTable('agent_cloud_pid', '计调云产品')
->help('产品列表显示的是该产品的标题和图片') ->help('产品列表显示的是该产品的标题和图片')
->title('选择产品') ->title('选择产品')
->dialogWidth('80%;min-width:825px;') ->dialogWidth('80%;min-width:825px;')
@ -260,7 +260,7 @@ class AgentProductController extends AdminController
// ->customFormat(fn($v) => !$v ? '' : $v) // ->customFormat(fn($v) => !$v ? '' : $v)
// ->required(); // ->required();
//组团版旅行社可以选择地接
//计调版旅行社可以选择地接
if (Admin::user()->type == AgentType::CLUSTER) { if (Admin::user()->type == AgentType::CLUSTER) {
$form->selectTable('guide_id', '地接人员') $form->selectTable('guide_id', '地接人员')
->title('选择地接人员') ->title('选择地接人员')
@ -328,11 +328,11 @@ class AgentProductController extends AdminController
return $form->response()->error('产品待审核或审核拒绝,不允许修改!'); return $form->response()->error('产品待审核或审核拒绝,不允许修改!');
} }
//组团云产品处理
//计调云产品处理
if ($form->type == 2) { if ($form->type == 2) {
$cloud_product = AgentProduct::find($form->agent_cloud_pid); $cloud_product = AgentProduct::find($form->agent_cloud_pid);
if (!$cloud_product || $cloud_product->status != ProductStatus::ON_SALE) { if (!$cloud_product || $cloud_product->status != ProductStatus::ON_SALE) {
return $form->response()->error('你选择的组团云产品状态异常,上架失败!');
return $form->response()->error('你选择的计调云产品状态异常,上架失败!');
} }
} }
@ -410,13 +410,13 @@ class AgentProductController extends AdminController
return $form->response()->error("产品售价不能小于供应商产品总售价{$total_price}"); return $form->response()->error("产品售价不能小于供应商产品总售价{$total_price}");
} }
//如果是组团版旅行社,标记为是云产品
//如果是计调版旅行社,标记为是云产品
if (Admin::user()->type == AgentType::CLUSTER) { if (Admin::user()->type == AgentType::CLUSTER) {
$form->hidden('is_cloud'); $form->hidden('is_cloud');
$form->is_cloud = 1; $form->is_cloud = 1;
} }
} }
//组团云产品
//计调云产品
else if ($form->type == 2) { else if ($form->type == 2) {
$form->agent_cloud_pid = (int)$form->agent_cloud_pid; $form->agent_cloud_pid = (int)$form->agent_cloud_pid;
if (!$form->agent_cloud_pid) { if (!$form->agent_cloud_pid) {
@ -437,11 +437,11 @@ class AgentProductController extends AdminController
})->find($form->agent_cloud_pid); })->find($form->agent_cloud_pid);
if (!$cloud_product) { if (!$cloud_product) {
return $form->response()->error('你选择的组团云产品库存不足或已下架,请重新选择');
return $form->response()->error('你选择的计调云产品库存不足或已下架,请重新选择');
} else if ($cloud_product->stock < $form->stock) { } else if ($cloud_product->stock < $form->stock) {
return $form->response()->error("组团云产品当前库存为{$cloud_product->stock},你设置的库存不能超过该数值");
return $form->response()->error("计调云产品当前库存为{$cloud_product->stock},你设置的库存不能超过该数值");
} else if ($form->price < $cloud_product->price) { } else if ($form->price < $cloud_product->price) {
return $form->response()->error("产品售价不能小于组团云产品售价{$cloud_product->price}");
return $form->response()->error("产品售价不能小于计调云产品售价{$cloud_product->price}");
} }
//同步关键字段信息 //同步关键字段信息
@ -543,7 +543,7 @@ class AgentProductController extends AdminController
} }
} }
//如果是组团云产品,且处于上架状态,同步信息到其它产品,否则下架所有关联的产品
//如果是计调云产品,且处于上架状态,同步信息到其它产品,否则下架所有关联的产品
if ($form->is_cloud) { if ($form->is_cloud) {
if ($form->status == ProductStatus::ON_SALE) { if ($form->status == ProductStatus::ON_SALE) {
$data = [ $data = [

2
app/AdminAgent/Renderable/SelectAgentCloudProduct.php

@ -8,7 +8,7 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Grid\LazyRenderable; use Dcat\Admin\Grid\LazyRenderable;
/** /**
* 选择代理商组团云产品
* 选择代理商计调云产品
* Class SelectProduct * Class SelectProduct
* @package App\AdminAgent\Renderable * @package App\AdminAgent\Renderable
*/ */

2
app/Http/Controllers/Api/AgentProductController.php

@ -94,7 +94,7 @@ class AgentProductController extends Controller
$agent_product->cost = ''; $agent_product->cost = '';
} }
//如果是单品销售,显示附加信息字段,组合产品和组团产品不显示
//如果是单品销售,显示附加信息字段,组合产品和计调产品不显示
if ($agent_product->type == 0) { if ($agent_product->type == 0) {
$agent_product->product = Product::query()->where('id', $agent_product->product_id)->first(['type', 'extends']); $agent_product->product = Product::query()->where('id', $agent_product->product_id)->first(['type', 'extends']);
} else { } else {

2
app/Models/Order.php

@ -123,7 +123,7 @@ class Order extends BaseModel
return $this->belongsTo(Guide::class); return $this->belongsTo(Guide::class);
} }
//关联的组团云产品
//关联的计调云产品
public function agentCloud() public function agentCloud()
{ {
return $this->belongsTo(AgentProduct::class, 'agent_cloud_pid', 'id'); return $this->belongsTo(AgentProduct::class, 'agent_cloud_pid', 'id');

4
resources/lang/zh_CN/order.php

@ -23,8 +23,8 @@ return [
'status' => '订单状态', 'status' => '订单状态',
'title' => '产品名称', 'title' => '产品名称',
'user_id' => '用户ID', 'user_id' => '用户ID',
'agent_cloud_pid' => '组团云产品ID',
'agent_cloud_price' => '组团云产品售价',
'agent_cloud_pid' => '计调云产品ID',
'agent_cloud_price' => '计调云产品售价',
'created_at' => '下单时间', 'created_at' => '下单时间',
], ],
'options' => [ 'options' => [

Loading…
Cancel
Save