From 72c611d8f77c26b0dffdf052e9993636cd228e7a Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 3 Sep 2021 19:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E5=9B=A2=E7=89=88?= =?UTF-8?q?=E6=97=85=E8=A1=8C=E7=A4=BE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MySQL_change.sql | 8 + .../Controllers/GroupOrderController.php | 121 +++++ .../Controllers/OrderController.php | 5 +- app/AdminAgent/routes.php | 1 + app/Models/Order.php | 11 + dcat_admin_ide_helper.php | 472 +++++++++--------- resources/lang/zh_CN/order.php | 2 + 7 files changed, 388 insertions(+), 232 deletions(-) create mode 100644 app/AdminAgent/Controllers/GroupOrderController.php diff --git a/MySQL_change.sql b/MySQL_change.sql index 5b00304..b725cd8 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -249,3 +249,11 @@ ALTER TABLE `agent_products` ADD COLUMN `agent_cloud_pid` INT(10) NOT NULL DEFAULT '0' COMMENT '组团版旅行社的云产品ID' AFTER `is_cloud`, ADD INDEX `agent_cloud_pid` (`agent_cloud_pid`); UPDATE `agent_products` ap SET `is_cloud`=1 WHERE EXISTS(SELECT 1 FROM `agents` WHERE `id`=ap.`agent_id` AND `type`=3); + +# 18:15 2021/9/3 +ALTER TABLE `orders` + ADD COLUMN `agent_cloud_pid` INT NOT NULL DEFAULT 0 COMMENT '组团云产品ID' AFTER `verify_code`, + ADD COLUMN `agent_cloud_price` DECIMAL(20,2) NOT NULL DEFAULT '0' COMMENT '组团云产品销售价格' AFTER `agent_cloud_pid`, + ADD INDEX `agent_cloud_pid` (`agent_cloud_pid`); + + diff --git a/app/AdminAgent/Controllers/GroupOrderController.php b/app/AdminAgent/Controllers/GroupOrderController.php new file mode 100644 index 0000000..752ae70 --- /dev/null +++ b/app/AdminAgent/Controllers/GroupOrderController.php @@ -0,0 +1,121 @@ +disableDeleteButton(); + $grid->disableBatchDelete(); + $grid->disableCreateButton(); + $grid->disableRowSelector(); + $grid->disableEditButton(); + + $grid->model()->whereHas('agentCloud', function ($query) { + return $query->where('agent_id', Admin::user()->id); + }); + + $grid->column('id')->sortable(); + $grid->column('order_no')->limit(10); + $grid->column('name'); + $grid->column('mobile'); + $grid->column('title'); + $grid->column('picture')->image('', 60, 60); + $grid->column('agent_cloud_pid', '产品ID'); + $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'); + $grid->column('paid_money'); + $grid->column('pay_type')->using(PayType::array()); + $grid->column('price'); + $grid->column('status')->using(OrderStatus::array()); + $grid->column('created_at'); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + + $filter->equal('id')->width(2); + $filter->equal('mobile')->width(2); + $filter->equal('order_no')->width(3); + $filter->equal('status')->select(OrderStatus::array())->width(2); + + $option = Supplier::query()->pluck('name', 'id'); + $filter->equal('product.supplier_id', '供应商')->select($option)->width(3); + + $filter->between('created_at')->datetime()->width(4); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new Order(['guide:id,name']), function (Show $show) { + $show->disableDeleteButton(); + $show->disableEditButton(); + + $show->field('id'); + $show->field('order_no'); + $show->field('name'); + $show->field('mobile'); + $show->field('title'); + $show->field('picture')->image('', 80, 80); + $show->field('agent_cloud_pid'); + $show->field('agent_cloud_price'); + $show->field('guide.name', '地接名称')->as(fn() => $this->guide->name); + $show->field('guide.contact_phone', '地接电话')->as(fn() => $this->guide->contact_phone); + $show->field('paid_at'); + $show->field('paid_money'); + $show->field('pay_type')->using(PayType::array()); + $show->field('price'); + $show->field('status')->using(OrderStatus::array()); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new Order(), function (Form $form) { + $form->disableDeleteButton(); + + $form->display('id'); + })->saving(function (Form $form) { + return $form->response()->error('操作禁止'); + })->deleting(function (Form $form) { + return $form->response()->error('操作禁止'); + }); + } +} diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php index 12771c5..ad82ced 100644 --- a/app/AdminAgent/Controllers/OrderController.php +++ b/app/AdminAgent/Controllers/OrderController.php @@ -8,7 +8,6 @@ use App\AdminAgent\Repositories\Order; use App\Common\OrderStatus; use App\Common\PayType; use App\Models\OrderProductItem; -use App\Models\Product; use App\Models\Supplier; use Dcat\Admin\Admin; use Dcat\Admin\Form; @@ -27,7 +26,7 @@ class OrderController extends AdminController */ protected function grid() { - return Grid::make(new Order(['agent:id,name', 'product']), function (Grid $grid) { + return Grid::make(new Order(['product']), function (Grid $grid) { $grid->disableDeleteButton(); $grid->disableBatchDelete(); $grid->disableCreateButton(); @@ -112,8 +111,6 @@ class OrderController extends AdminController $grid->filter(function (Grid\Filter $filter) { $filter->panel(); - $filter->model()->where('agent_id', Admin::user()->id); - $filter->equal('id')->width(2); $filter->equal('mobile')->width(2); $filter->equal('order_no')->width(3); diff --git a/app/AdminAgent/routes.php b/app/AdminAgent/routes.php index 1f98d86..c375c7d 100644 --- a/app/AdminAgent/routes.php +++ b/app/AdminAgent/routes.php @@ -36,5 +36,6 @@ Route::group([ $router->resource('article/list', 'ArticleController'); $router->resource('setting', 'SettingController'); $router->resource('channel/list', 'ChannelController'); + $router->resource('group_order/list', 'GroupOrderController'); $router->resource('finance_statistics', 'FinanceStatisticsController'); }); diff --git a/app/Models/Order.php b/app/Models/Order.php index 0b31746..d6ccb67 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -106,4 +106,15 @@ class Order extends BaseModel { return $this->hasMany(OrderProductItem::class); } + + public function guide() + { + return $this->belongsTo(Guide::class); + } + + //关联的组团云产品 + public function agentCloud() + { + return $this->belongsTo(AgentProduct::class, 'agent_cloud_pid', 'id'); + } } diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index c44c581..5ab0935 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -11,490 +11,506 @@ namespace Dcat\Admin { use Illuminate\Support\Collection; /** - * @property Grid\Column|Collection id * @property Grid\Column|Collection agent_id - * @property Grid\Column|Collection picture + * @property Grid\Column|Collection created_at + * @property Grid\Column|Collection desc + * @property Grid\Column|Collection id * @property Grid\Column|Collection name + * @property Grid\Column|Collection picture * @property Grid\Column|Collection tag - * @property Grid\Column|Collection desc - * @property Grid\Column|Collection created_at * @property Grid\Column|Collection updated_at - * @property Grid\Column|Collection product_id - * @property Grid\Column|Collection know * @property Grid\Column|Collection content + * @property Grid\Column|Collection know + * @property Grid\Column|Collection product_id + * @property Grid\Column|Collection detail * @property Grid\Column|Collection type * @property Grid\Column|Collection version - * @property Grid\Column|Collection detail * @property Grid\Column|Collection is_enabled - * @property Grid\Column|Collection parent_id - * @property Grid\Column|Collection order + * @property Grid\Column|Collection extension * @property Grid\Column|Collection icon + * @property Grid\Column|Collection order + * @property Grid\Column|Collection parent_id * @property Grid\Column|Collection uri - * @property Grid\Column|Collection extension - * @property Grid\Column|Collection permission_id * @property Grid\Column|Collection menu_id - * @property Grid\Column|Collection slug + * @property Grid\Column|Collection permission_id * @property Grid\Column|Collection http_method * @property Grid\Column|Collection http_path + * @property Grid\Column|Collection slug * @property Grid\Column|Collection role_id * @property Grid\Column|Collection user_id * @property Grid\Column|Collection value - * @property Grid\Column|Collection username - * @property Grid\Column|Collection password * @property Grid\Column|Collection avatar + * @property Grid\Column|Collection password * @property Grid\Column|Collection remember_token - * @property Grid\Column|Collection status + * @property Grid\Column|Collection username + * @property Grid\Column|Collection display * @property Grid\Column|Collection sort + * @property Grid\Column|Collection status * @property Grid\Column|Collection url - * @property Grid\Column|Collection display * @property Grid\Column|Collection about - * @property Grid\Column|Collection reg_protocol * @property Grid\Column|Collection buy_protocol - * @property Grid\Column|Collection supplier_id + * @property Grid\Column|Collection reg_protocol * @property Grid\Column|Collection agent_product_id - * @property Grid\Column|Collection product_ids - * @property Grid\Column|Collection price - * @property Grid\Column|Collection original_price - * @property Grid\Column|Collection sale - * @property Grid\Column|Collection stock - * @property Grid\Column|Collection channel_id + * @property Grid\Column|Collection supplier_id + * @property Grid\Column|Collection agent_cloud_pid * @property Grid\Column|Collection category_id - * @property Grid\Column|Collection guide_id - * @property Grid\Column|Collection verifier - * @property Grid\Column|Collection is_rec - * @property Grid\Column|Collection pictures + * @property Grid\Column|Collection channel_id + * @property Grid\Column|Collection deleted_at * @property Grid\Column|Collection deposit * @property Grid\Column|Collection deposit_timeout * @property Grid\Column|Collection earnest * @property Grid\Column|Collection earnest_timeout - * @property Grid\Column|Collection deleted_at + * @property Grid\Column|Collection guide_id + * @property Grid\Column|Collection is_cloud + * @property Grid\Column|Collection is_rec + * @property Grid\Column|Collection original_price + * @property Grid\Column|Collection pictures + * @property Grid\Column|Collection price + * @property Grid\Column|Collection product_ids + * @property Grid\Column|Collection sale + * @property Grid\Column|Collection stock + * @property Grid\Column|Collection verifier * @property Grid\Column|Collection setting + * @property Grid\Column|Collection address * @property Grid\Column|Collection appid * @property Grid\Column|Collection appsecret - * @property Grid\Column|Collection mchid - * @property Grid\Column|Collection mchkey * @property Grid\Column|Collection company_name - * @property Grid\Column|Collection logo - * @property Grid\Column|Collection address - * @property Grid\Column|Collection license_pic - * @property Grid\Column|Collection director * @property Grid\Column|Collection contact_phone + * @property Grid\Column|Collection director + * @property Grid\Column|Collection license_pic + * @property Grid\Column|Collection logo + * @property Grid\Column|Collection mchid + * @property Grid\Column|Collection mchkey * @property Grid\Column|Collection rate + * @property Grid\Column|Collection agent_product_ids * @property Grid\Column|Collection author * @property Grid\Column|Collection image - * @property Grid\Column|Collection agent_product_ids * @property Grid\Column|Collection pid * @property Grid\Column|Collection template - * @property Grid\Column|Collection start_at * @property Grid\Column|Collection end_at + * @property Grid\Column|Collection start_at + * @property Grid\Column|Collection bidding_id + * @property Grid\Column|Collection bidding_user_id + * @property Grid\Column|Collection bidding_user_type * @property Grid\Column|Collection comment * @property Grid\Column|Collection deadline - * @property Grid\Column|Collection publisher_type + * @property Grid\Column|Collection demand_product_id + * @property Grid\Column|Collection images * @property Grid\Column|Collection publisher_id + * @property Grid\Column|Collection publisher_type * @property Grid\Column|Collection state - * @property Grid\Column|Collection bidding_user_type - * @property Grid\Column|Collection bidding_user_id - * @property Grid\Column|Collection bidding_id - * @property Grid\Column|Collection images * @property Grid\Column|Collection demand_id - * @property Grid\Column|Collection uuid * @property Grid\Column|Collection connection - * @property Grid\Column|Collection queue - * @property Grid\Column|Collection payload * @property Grid\Column|Collection exception * @property Grid\Column|Collection failed_at + * @property Grid\Column|Collection payload + * @property Grid\Column|Collection queue + * @property Grid\Column|Collection uuid * @property Grid\Column|Collection photo - * @property Grid\Column|Collection order_id - * @property Grid\Column|Collection order_no * @property Grid\Column|Collection num - * @property Grid\Column|Collection mobile - * @property Grid\Column|Collection pay_type + * @property Grid\Column|Collection order_id + * @property Grid\Column|Collection agent_cloud_price * @property Grid\Column|Collection coupon_id - * @property Grid\Column|Collection paid_money + * @property Grid\Column|Collection mobile + * @property Grid\Column|Collection order_no * @property Grid\Column|Collection paid_at + * @property Grid\Column|Collection paid_money + * @property Grid\Column|Collection pay_type * @property Grid\Column|Collection refund_info - * @property Grid\Column|Collection verify_code * @property Grid\Column|Collection timeout + * @property Grid\Column|Collection verify_code * @property Grid\Column|Collection email * @property Grid\Column|Collection token * @property Grid\Column|Collection verify_mobile * @property Grid\Column|Collection channels * @property Grid\Column|Collection money * @property Grid\Column|Collection transaction_id - * @property Grid\Column|Collection nickname - * @property Grid\Column|Collection openid - * @property Grid\Column|Collection unionid - * @property Grid\Column|Collection country - * @property Grid\Column|Collection province * @property Grid\Column|Collection city + * @property Grid\Column|Collection country * @property Grid\Column|Collection gender - * @property Grid\Column|Collection language * @property Grid\Column|Collection is_verify + * @property Grid\Column|Collection language + * @property Grid\Column|Collection nickname + * @property Grid\Column|Collection openid + * @property Grid\Column|Collection province + * @property Grid\Column|Collection unionid * - * @method Grid\Column|Collection id(string $label = null) * @method Grid\Column|Collection agent_id(string $label = null) - * @method Grid\Column|Collection picture(string $label = null) + * @method Grid\Column|Collection created_at(string $label = null) + * @method Grid\Column|Collection desc(string $label = null) + * @method Grid\Column|Collection id(string $label = null) * @method Grid\Column|Collection name(string $label = null) + * @method Grid\Column|Collection picture(string $label = null) * @method Grid\Column|Collection tag(string $label = null) - * @method Grid\Column|Collection desc(string $label = null) - * @method Grid\Column|Collection created_at(string $label = null) * @method Grid\Column|Collection updated_at(string $label = null) - * @method Grid\Column|Collection product_id(string $label = null) - * @method Grid\Column|Collection know(string $label = null) * @method Grid\Column|Collection content(string $label = null) + * @method Grid\Column|Collection know(string $label = null) + * @method Grid\Column|Collection product_id(string $label = null) + * @method Grid\Column|Collection detail(string $label = null) * @method Grid\Column|Collection type(string $label = null) * @method Grid\Column|Collection version(string $label = null) - * @method Grid\Column|Collection detail(string $label = null) * @method Grid\Column|Collection is_enabled(string $label = null) - * @method Grid\Column|Collection parent_id(string $label = null) - * @method Grid\Column|Collection order(string $label = null) + * @method Grid\Column|Collection extension(string $label = null) * @method Grid\Column|Collection icon(string $label = null) + * @method Grid\Column|Collection order(string $label = null) + * @method Grid\Column|Collection parent_id(string $label = null) * @method Grid\Column|Collection uri(string $label = null) - * @method Grid\Column|Collection extension(string $label = null) - * @method Grid\Column|Collection permission_id(string $label = null) * @method Grid\Column|Collection menu_id(string $label = null) - * @method Grid\Column|Collection slug(string $label = null) + * @method Grid\Column|Collection permission_id(string $label = null) * @method Grid\Column|Collection http_method(string $label = null) * @method Grid\Column|Collection http_path(string $label = null) + * @method Grid\Column|Collection slug(string $label = null) * @method Grid\Column|Collection role_id(string $label = null) * @method Grid\Column|Collection user_id(string $label = null) * @method Grid\Column|Collection value(string $label = null) - * @method Grid\Column|Collection username(string $label = null) - * @method Grid\Column|Collection password(string $label = null) * @method Grid\Column|Collection avatar(string $label = null) + * @method Grid\Column|Collection password(string $label = null) * @method Grid\Column|Collection remember_token(string $label = null) - * @method Grid\Column|Collection status(string $label = null) + * @method Grid\Column|Collection username(string $label = null) + * @method Grid\Column|Collection display(string $label = null) * @method Grid\Column|Collection sort(string $label = null) + * @method Grid\Column|Collection status(string $label = null) * @method Grid\Column|Collection url(string $label = null) - * @method Grid\Column|Collection display(string $label = null) * @method Grid\Column|Collection about(string $label = null) - * @method Grid\Column|Collection reg_protocol(string $label = null) * @method Grid\Column|Collection buy_protocol(string $label = null) - * @method Grid\Column|Collection supplier_id(string $label = null) + * @method Grid\Column|Collection reg_protocol(string $label = null) * @method Grid\Column|Collection agent_product_id(string $label = null) - * @method Grid\Column|Collection product_ids(string $label = null) - * @method Grid\Column|Collection price(string $label = null) - * @method Grid\Column|Collection original_price(string $label = null) - * @method Grid\Column|Collection sale(string $label = null) - * @method Grid\Column|Collection stock(string $label = null) - * @method Grid\Column|Collection channel_id(string $label = null) + * @method Grid\Column|Collection supplier_id(string $label = null) + * @method Grid\Column|Collection agent_cloud_pid(string $label = null) * @method Grid\Column|Collection category_id(string $label = null) - * @method Grid\Column|Collection guide_id(string $label = null) - * @method Grid\Column|Collection verifier(string $label = null) - * @method Grid\Column|Collection is_rec(string $label = null) - * @method Grid\Column|Collection pictures(string $label = null) + * @method Grid\Column|Collection channel_id(string $label = null) + * @method Grid\Column|Collection deleted_at(string $label = null) * @method Grid\Column|Collection deposit(string $label = null) * @method Grid\Column|Collection deposit_timeout(string $label = null) * @method Grid\Column|Collection earnest(string $label = null) * @method Grid\Column|Collection earnest_timeout(string $label = null) - * @method Grid\Column|Collection deleted_at(string $label = null) + * @method Grid\Column|Collection guide_id(string $label = null) + * @method Grid\Column|Collection is_cloud(string $label = null) + * @method Grid\Column|Collection is_rec(string $label = null) + * @method Grid\Column|Collection original_price(string $label = null) + * @method Grid\Column|Collection pictures(string $label = null) + * @method Grid\Column|Collection price(string $label = null) + * @method Grid\Column|Collection product_ids(string $label = null) + * @method Grid\Column|Collection sale(string $label = null) + * @method Grid\Column|Collection stock(string $label = null) + * @method Grid\Column|Collection verifier(string $label = null) * @method Grid\Column|Collection setting(string $label = null) + * @method Grid\Column|Collection address(string $label = null) * @method Grid\Column|Collection appid(string $label = null) * @method Grid\Column|Collection appsecret(string $label = null) - * @method Grid\Column|Collection mchid(string $label = null) - * @method Grid\Column|Collection mchkey(string $label = null) * @method Grid\Column|Collection company_name(string $label = null) - * @method Grid\Column|Collection logo(string $label = null) - * @method Grid\Column|Collection address(string $label = null) - * @method Grid\Column|Collection license_pic(string $label = null) - * @method Grid\Column|Collection director(string $label = null) * @method Grid\Column|Collection contact_phone(string $label = null) + * @method Grid\Column|Collection director(string $label = null) + * @method Grid\Column|Collection license_pic(string $label = null) + * @method Grid\Column|Collection logo(string $label = null) + * @method Grid\Column|Collection mchid(string $label = null) + * @method Grid\Column|Collection mchkey(string $label = null) * @method Grid\Column|Collection rate(string $label = null) + * @method Grid\Column|Collection agent_product_ids(string $label = null) * @method Grid\Column|Collection author(string $label = null) * @method Grid\Column|Collection image(string $label = null) - * @method Grid\Column|Collection agent_product_ids(string $label = null) * @method Grid\Column|Collection pid(string $label = null) * @method Grid\Column|Collection template(string $label = null) - * @method Grid\Column|Collection start_at(string $label = null) * @method Grid\Column|Collection end_at(string $label = null) + * @method Grid\Column|Collection start_at(string $label = null) + * @method Grid\Column|Collection bidding_id(string $label = null) + * @method Grid\Column|Collection bidding_user_id(string $label = null) + * @method Grid\Column|Collection bidding_user_type(string $label = null) * @method Grid\Column|Collection comment(string $label = null) * @method Grid\Column|Collection deadline(string $label = null) - * @method Grid\Column|Collection publisher_type(string $label = null) + * @method Grid\Column|Collection demand_product_id(string $label = null) + * @method Grid\Column|Collection images(string $label = null) * @method Grid\Column|Collection publisher_id(string $label = null) + * @method Grid\Column|Collection publisher_type(string $label = null) * @method Grid\Column|Collection state(string $label = null) - * @method Grid\Column|Collection bidding_user_type(string $label = null) - * @method Grid\Column|Collection bidding_user_id(string $label = null) - * @method Grid\Column|Collection bidding_id(string $label = null) - * @method Grid\Column|Collection images(string $label = null) * @method Grid\Column|Collection demand_id(string $label = null) - * @method Grid\Column|Collection uuid(string $label = null) * @method Grid\Column|Collection connection(string $label = null) - * @method Grid\Column|Collection queue(string $label = null) - * @method Grid\Column|Collection payload(string $label = null) * @method Grid\Column|Collection exception(string $label = null) * @method Grid\Column|Collection failed_at(string $label = null) + * @method Grid\Column|Collection payload(string $label = null) + * @method Grid\Column|Collection queue(string $label = null) + * @method Grid\Column|Collection uuid(string $label = null) * @method Grid\Column|Collection photo(string $label = null) - * @method Grid\Column|Collection order_id(string $label = null) - * @method Grid\Column|Collection order_no(string $label = null) * @method Grid\Column|Collection num(string $label = null) - * @method Grid\Column|Collection mobile(string $label = null) - * @method Grid\Column|Collection pay_type(string $label = null) + * @method Grid\Column|Collection order_id(string $label = null) + * @method Grid\Column|Collection agent_cloud_price(string $label = null) * @method Grid\Column|Collection coupon_id(string $label = null) - * @method Grid\Column|Collection paid_money(string $label = null) + * @method Grid\Column|Collection mobile(string $label = null) + * @method Grid\Column|Collection order_no(string $label = null) * @method Grid\Column|Collection paid_at(string $label = null) + * @method Grid\Column|Collection paid_money(string $label = null) + * @method Grid\Column|Collection pay_type(string $label = null) * @method Grid\Column|Collection refund_info(string $label = null) - * @method Grid\Column|Collection verify_code(string $label = null) * @method Grid\Column|Collection timeout(string $label = null) + * @method Grid\Column|Collection verify_code(string $label = null) * @method Grid\Column|Collection email(string $label = null) * @method Grid\Column|Collection token(string $label = null) * @method Grid\Column|Collection verify_mobile(string $label = null) * @method Grid\Column|Collection channels(string $label = null) * @method Grid\Column|Collection money(string $label = null) * @method Grid\Column|Collection transaction_id(string $label = null) - * @method Grid\Column|Collection nickname(string $label = null) - * @method Grid\Column|Collection openid(string $label = null) - * @method Grid\Column|Collection unionid(string $label = null) - * @method Grid\Column|Collection country(string $label = null) - * @method Grid\Column|Collection province(string $label = null) * @method Grid\Column|Collection city(string $label = null) + * @method Grid\Column|Collection country(string $label = null) * @method Grid\Column|Collection gender(string $label = null) - * @method Grid\Column|Collection language(string $label = null) * @method Grid\Column|Collection is_verify(string $label = null) + * @method Grid\Column|Collection language(string $label = null) + * @method Grid\Column|Collection nickname(string $label = null) + * @method Grid\Column|Collection openid(string $label = null) + * @method Grid\Column|Collection province(string $label = null) + * @method Grid\Column|Collection unionid(string $label = null) */ class Grid {} class MiniGrid extends Grid {} /** - * @property Show\Field|Collection id * @property Show\Field|Collection agent_id - * @property Show\Field|Collection picture + * @property Show\Field|Collection created_at + * @property Show\Field|Collection desc + * @property Show\Field|Collection id * @property Show\Field|Collection name + * @property Show\Field|Collection picture * @property Show\Field|Collection tag - * @property Show\Field|Collection desc - * @property Show\Field|Collection created_at * @property Show\Field|Collection updated_at - * @property Show\Field|Collection product_id - * @property Show\Field|Collection know * @property Show\Field|Collection content + * @property Show\Field|Collection know + * @property Show\Field|Collection product_id + * @property Show\Field|Collection detail * @property Show\Field|Collection type * @property Show\Field|Collection version - * @property Show\Field|Collection detail * @property Show\Field|Collection is_enabled - * @property Show\Field|Collection parent_id - * @property Show\Field|Collection order + * @property Show\Field|Collection extension * @property Show\Field|Collection icon + * @property Show\Field|Collection order + * @property Show\Field|Collection parent_id * @property Show\Field|Collection uri - * @property Show\Field|Collection extension - * @property Show\Field|Collection permission_id * @property Show\Field|Collection menu_id - * @property Show\Field|Collection slug + * @property Show\Field|Collection permission_id * @property Show\Field|Collection http_method * @property Show\Field|Collection http_path + * @property Show\Field|Collection slug * @property Show\Field|Collection role_id * @property Show\Field|Collection user_id * @property Show\Field|Collection value - * @property Show\Field|Collection username - * @property Show\Field|Collection password * @property Show\Field|Collection avatar + * @property Show\Field|Collection password * @property Show\Field|Collection remember_token - * @property Show\Field|Collection status + * @property Show\Field|Collection username + * @property Show\Field|Collection display * @property Show\Field|Collection sort + * @property Show\Field|Collection status * @property Show\Field|Collection url - * @property Show\Field|Collection display * @property Show\Field|Collection about - * @property Show\Field|Collection reg_protocol * @property Show\Field|Collection buy_protocol - * @property Show\Field|Collection supplier_id + * @property Show\Field|Collection reg_protocol * @property Show\Field|Collection agent_product_id - * @property Show\Field|Collection product_ids - * @property Show\Field|Collection price - * @property Show\Field|Collection original_price - * @property Show\Field|Collection sale - * @property Show\Field|Collection stock - * @property Show\Field|Collection channel_id + * @property Show\Field|Collection supplier_id + * @property Show\Field|Collection agent_cloud_pid * @property Show\Field|Collection category_id - * @property Show\Field|Collection guide_id - * @property Show\Field|Collection verifier - * @property Show\Field|Collection is_rec - * @property Show\Field|Collection pictures + * @property Show\Field|Collection channel_id + * @property Show\Field|Collection deleted_at * @property Show\Field|Collection deposit * @property Show\Field|Collection deposit_timeout * @property Show\Field|Collection earnest * @property Show\Field|Collection earnest_timeout - * @property Show\Field|Collection deleted_at + * @property Show\Field|Collection guide_id + * @property Show\Field|Collection is_cloud + * @property Show\Field|Collection is_rec + * @property Show\Field|Collection original_price + * @property Show\Field|Collection pictures + * @property Show\Field|Collection price + * @property Show\Field|Collection product_ids + * @property Show\Field|Collection sale + * @property Show\Field|Collection stock + * @property Show\Field|Collection verifier * @property Show\Field|Collection setting + * @property Show\Field|Collection address * @property Show\Field|Collection appid * @property Show\Field|Collection appsecret - * @property Show\Field|Collection mchid - * @property Show\Field|Collection mchkey * @property Show\Field|Collection company_name - * @property Show\Field|Collection logo - * @property Show\Field|Collection address - * @property Show\Field|Collection license_pic - * @property Show\Field|Collection director * @property Show\Field|Collection contact_phone + * @property Show\Field|Collection director + * @property Show\Field|Collection license_pic + * @property Show\Field|Collection logo + * @property Show\Field|Collection mchid + * @property Show\Field|Collection mchkey * @property Show\Field|Collection rate + * @property Show\Field|Collection agent_product_ids * @property Show\Field|Collection author * @property Show\Field|Collection image - * @property Show\Field|Collection agent_product_ids * @property Show\Field|Collection pid * @property Show\Field|Collection template - * @property Show\Field|Collection start_at * @property Show\Field|Collection end_at + * @property Show\Field|Collection start_at + * @property Show\Field|Collection bidding_id + * @property Show\Field|Collection bidding_user_id + * @property Show\Field|Collection bidding_user_type * @property Show\Field|Collection comment * @property Show\Field|Collection deadline - * @property Show\Field|Collection publisher_type + * @property Show\Field|Collection demand_product_id + * @property Show\Field|Collection images * @property Show\Field|Collection publisher_id + * @property Show\Field|Collection publisher_type * @property Show\Field|Collection state - * @property Show\Field|Collection bidding_user_type - * @property Show\Field|Collection bidding_user_id - * @property Show\Field|Collection bidding_id - * @property Show\Field|Collection images * @property Show\Field|Collection demand_id - * @property Show\Field|Collection uuid * @property Show\Field|Collection connection - * @property Show\Field|Collection queue - * @property Show\Field|Collection payload * @property Show\Field|Collection exception * @property Show\Field|Collection failed_at + * @property Show\Field|Collection payload + * @property Show\Field|Collection queue + * @property Show\Field|Collection uuid * @property Show\Field|Collection photo - * @property Show\Field|Collection order_id - * @property Show\Field|Collection order_no * @property Show\Field|Collection num - * @property Show\Field|Collection mobile - * @property Show\Field|Collection pay_type + * @property Show\Field|Collection order_id + * @property Show\Field|Collection agent_cloud_price * @property Show\Field|Collection coupon_id - * @property Show\Field|Collection paid_money + * @property Show\Field|Collection mobile + * @property Show\Field|Collection order_no * @property Show\Field|Collection paid_at + * @property Show\Field|Collection paid_money + * @property Show\Field|Collection pay_type * @property Show\Field|Collection refund_info - * @property Show\Field|Collection verify_code * @property Show\Field|Collection timeout + * @property Show\Field|Collection verify_code * @property Show\Field|Collection email * @property Show\Field|Collection token * @property Show\Field|Collection verify_mobile * @property Show\Field|Collection channels * @property Show\Field|Collection money * @property Show\Field|Collection transaction_id - * @property Show\Field|Collection nickname - * @property Show\Field|Collection openid - * @property Show\Field|Collection unionid - * @property Show\Field|Collection country - * @property Show\Field|Collection province * @property Show\Field|Collection city + * @property Show\Field|Collection country * @property Show\Field|Collection gender - * @property Show\Field|Collection language * @property Show\Field|Collection is_verify + * @property Show\Field|Collection language + * @property Show\Field|Collection nickname + * @property Show\Field|Collection openid + * @property Show\Field|Collection province + * @property Show\Field|Collection unionid * - * @method Show\Field|Collection id(string $label = null) * @method Show\Field|Collection agent_id(string $label = null) - * @method Show\Field|Collection picture(string $label = null) + * @method Show\Field|Collection created_at(string $label = null) + * @method Show\Field|Collection desc(string $label = null) + * @method Show\Field|Collection id(string $label = null) * @method Show\Field|Collection name(string $label = null) + * @method Show\Field|Collection picture(string $label = null) * @method Show\Field|Collection tag(string $label = null) - * @method Show\Field|Collection desc(string $label = null) - * @method Show\Field|Collection created_at(string $label = null) * @method Show\Field|Collection updated_at(string $label = null) - * @method Show\Field|Collection product_id(string $label = null) - * @method Show\Field|Collection know(string $label = null) * @method Show\Field|Collection content(string $label = null) + * @method Show\Field|Collection know(string $label = null) + * @method Show\Field|Collection product_id(string $label = null) + * @method Show\Field|Collection detail(string $label = null) * @method Show\Field|Collection type(string $label = null) * @method Show\Field|Collection version(string $label = null) - * @method Show\Field|Collection detail(string $label = null) * @method Show\Field|Collection is_enabled(string $label = null) - * @method Show\Field|Collection parent_id(string $label = null) - * @method Show\Field|Collection order(string $label = null) + * @method Show\Field|Collection extension(string $label = null) * @method Show\Field|Collection icon(string $label = null) + * @method Show\Field|Collection order(string $label = null) + * @method Show\Field|Collection parent_id(string $label = null) * @method Show\Field|Collection uri(string $label = null) - * @method Show\Field|Collection extension(string $label = null) - * @method Show\Field|Collection permission_id(string $label = null) * @method Show\Field|Collection menu_id(string $label = null) - * @method Show\Field|Collection slug(string $label = null) + * @method Show\Field|Collection permission_id(string $label = null) * @method Show\Field|Collection http_method(string $label = null) * @method Show\Field|Collection http_path(string $label = null) + * @method Show\Field|Collection slug(string $label = null) * @method Show\Field|Collection role_id(string $label = null) * @method Show\Field|Collection user_id(string $label = null) * @method Show\Field|Collection value(string $label = null) - * @method Show\Field|Collection username(string $label = null) - * @method Show\Field|Collection password(string $label = null) * @method Show\Field|Collection avatar(string $label = null) + * @method Show\Field|Collection password(string $label = null) * @method Show\Field|Collection remember_token(string $label = null) - * @method Show\Field|Collection status(string $label = null) + * @method Show\Field|Collection username(string $label = null) + * @method Show\Field|Collection display(string $label = null) * @method Show\Field|Collection sort(string $label = null) + * @method Show\Field|Collection status(string $label = null) * @method Show\Field|Collection url(string $label = null) - * @method Show\Field|Collection display(string $label = null) * @method Show\Field|Collection about(string $label = null) - * @method Show\Field|Collection reg_protocol(string $label = null) * @method Show\Field|Collection buy_protocol(string $label = null) - * @method Show\Field|Collection supplier_id(string $label = null) + * @method Show\Field|Collection reg_protocol(string $label = null) * @method Show\Field|Collection agent_product_id(string $label = null) - * @method Show\Field|Collection product_ids(string $label = null) - * @method Show\Field|Collection price(string $label = null) - * @method Show\Field|Collection original_price(string $label = null) - * @method Show\Field|Collection sale(string $label = null) - * @method Show\Field|Collection stock(string $label = null) - * @method Show\Field|Collection channel_id(string $label = null) + * @method Show\Field|Collection supplier_id(string $label = null) + * @method Show\Field|Collection agent_cloud_pid(string $label = null) * @method Show\Field|Collection category_id(string $label = null) - * @method Show\Field|Collection guide_id(string $label = null) - * @method Show\Field|Collection verifier(string $label = null) - * @method Show\Field|Collection is_rec(string $label = null) - * @method Show\Field|Collection pictures(string $label = null) + * @method Show\Field|Collection channel_id(string $label = null) + * @method Show\Field|Collection deleted_at(string $label = null) * @method Show\Field|Collection deposit(string $label = null) * @method Show\Field|Collection deposit_timeout(string $label = null) * @method Show\Field|Collection earnest(string $label = null) * @method Show\Field|Collection earnest_timeout(string $label = null) - * @method Show\Field|Collection deleted_at(string $label = null) + * @method Show\Field|Collection guide_id(string $label = null) + * @method Show\Field|Collection is_cloud(string $label = null) + * @method Show\Field|Collection is_rec(string $label = null) + * @method Show\Field|Collection original_price(string $label = null) + * @method Show\Field|Collection pictures(string $label = null) + * @method Show\Field|Collection price(string $label = null) + * @method Show\Field|Collection product_ids(string $label = null) + * @method Show\Field|Collection sale(string $label = null) + * @method Show\Field|Collection stock(string $label = null) + * @method Show\Field|Collection verifier(string $label = null) * @method Show\Field|Collection setting(string $label = null) + * @method Show\Field|Collection address(string $label = null) * @method Show\Field|Collection appid(string $label = null) * @method Show\Field|Collection appsecret(string $label = null) - * @method Show\Field|Collection mchid(string $label = null) - * @method Show\Field|Collection mchkey(string $label = null) * @method Show\Field|Collection company_name(string $label = null) - * @method Show\Field|Collection logo(string $label = null) - * @method Show\Field|Collection address(string $label = null) - * @method Show\Field|Collection license_pic(string $label = null) - * @method Show\Field|Collection director(string $label = null) * @method Show\Field|Collection contact_phone(string $label = null) + * @method Show\Field|Collection director(string $label = null) + * @method Show\Field|Collection license_pic(string $label = null) + * @method Show\Field|Collection logo(string $label = null) + * @method Show\Field|Collection mchid(string $label = null) + * @method Show\Field|Collection mchkey(string $label = null) * @method Show\Field|Collection rate(string $label = null) + * @method Show\Field|Collection agent_product_ids(string $label = null) * @method Show\Field|Collection author(string $label = null) * @method Show\Field|Collection image(string $label = null) - * @method Show\Field|Collection agent_product_ids(string $label = null) * @method Show\Field|Collection pid(string $label = null) * @method Show\Field|Collection template(string $label = null) - * @method Show\Field|Collection start_at(string $label = null) * @method Show\Field|Collection end_at(string $label = null) + * @method Show\Field|Collection start_at(string $label = null) + * @method Show\Field|Collection bidding_id(string $label = null) + * @method Show\Field|Collection bidding_user_id(string $label = null) + * @method Show\Field|Collection bidding_user_type(string $label = null) * @method Show\Field|Collection comment(string $label = null) * @method Show\Field|Collection deadline(string $label = null) - * @method Show\Field|Collection publisher_type(string $label = null) + * @method Show\Field|Collection demand_product_id(string $label = null) + * @method Show\Field|Collection images(string $label = null) * @method Show\Field|Collection publisher_id(string $label = null) + * @method Show\Field|Collection publisher_type(string $label = null) * @method Show\Field|Collection state(string $label = null) - * @method Show\Field|Collection bidding_user_type(string $label = null) - * @method Show\Field|Collection bidding_user_id(string $label = null) - * @method Show\Field|Collection bidding_id(string $label = null) - * @method Show\Field|Collection images(string $label = null) * @method Show\Field|Collection demand_id(string $label = null) - * @method Show\Field|Collection uuid(string $label = null) * @method Show\Field|Collection connection(string $label = null) - * @method Show\Field|Collection queue(string $label = null) - * @method Show\Field|Collection payload(string $label = null) * @method Show\Field|Collection exception(string $label = null) * @method Show\Field|Collection failed_at(string $label = null) + * @method Show\Field|Collection payload(string $label = null) + * @method Show\Field|Collection queue(string $label = null) + * @method Show\Field|Collection uuid(string $label = null) * @method Show\Field|Collection photo(string $label = null) - * @method Show\Field|Collection order_id(string $label = null) - * @method Show\Field|Collection order_no(string $label = null) * @method Show\Field|Collection num(string $label = null) - * @method Show\Field|Collection mobile(string $label = null) - * @method Show\Field|Collection pay_type(string $label = null) + * @method Show\Field|Collection order_id(string $label = null) + * @method Show\Field|Collection agent_cloud_price(string $label = null) * @method Show\Field|Collection coupon_id(string $label = null) - * @method Show\Field|Collection paid_money(string $label = null) + * @method Show\Field|Collection mobile(string $label = null) + * @method Show\Field|Collection order_no(string $label = null) * @method Show\Field|Collection paid_at(string $label = null) + * @method Show\Field|Collection paid_money(string $label = null) + * @method Show\Field|Collection pay_type(string $label = null) * @method Show\Field|Collection refund_info(string $label = null) - * @method Show\Field|Collection verify_code(string $label = null) * @method Show\Field|Collection timeout(string $label = null) + * @method Show\Field|Collection verify_code(string $label = null) * @method Show\Field|Collection email(string $label = null) * @method Show\Field|Collection token(string $label = null) * @method Show\Field|Collection verify_mobile(string $label = null) * @method Show\Field|Collection channels(string $label = null) * @method Show\Field|Collection money(string $label = null) * @method Show\Field|Collection transaction_id(string $label = null) - * @method Show\Field|Collection nickname(string $label = null) - * @method Show\Field|Collection openid(string $label = null) - * @method Show\Field|Collection unionid(string $label = null) - * @method Show\Field|Collection country(string $label = null) - * @method Show\Field|Collection province(string $label = null) * @method Show\Field|Collection city(string $label = null) + * @method Show\Field|Collection country(string $label = null) * @method Show\Field|Collection gender(string $label = null) - * @method Show\Field|Collection language(string $label = null) * @method Show\Field|Collection is_verify(string $label = null) + * @method Show\Field|Collection language(string $label = null) + * @method Show\Field|Collection nickname(string $label = null) + * @method Show\Field|Collection openid(string $label = null) + * @method Show\Field|Collection province(string $label = null) + * @method Show\Field|Collection unionid(string $label = null) */ class Show {} diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php index 787770a..fac16ba 100644 --- a/resources/lang/zh_CN/order.php +++ b/resources/lang/zh_CN/order.php @@ -23,6 +23,8 @@ return [ 'status' => '订单状态', 'title' => '产品名称', 'user_id' => '用户ID', + 'agent_cloud_pid' => '组团云产品ID', + 'agent_cloud_price' => '组团云产品售价', 'created_at' => '下单时间', ], 'options' => [