添加后台查看砍价日志明细
parent
f5dbc14334
commit
9ad18cecef
|
|
@ -5,6 +5,7 @@ namespace App\Admin\Controllers;
|
|||
use App\Admin\Renderable\ProductSkuSimpleTable;
|
||||
use App\Admin\Repositories\BargainActivity;
|
||||
use App\Models\BargainActivity as BargainActivityModel;
|
||||
use App\Models\BargainOrder;
|
||||
use App\Models\ProductSku;
|
||||
use Carbon\Carbon;
|
||||
use Dcat\Admin\Admin;
|
||||
|
|
@ -14,6 +15,8 @@ use Dcat\Admin\Grid\Column;
|
|||
use Dcat\Admin\Http\Controllers\AdminController;
|
||||
use Dcat\Admin\Layout\Row;
|
||||
use Dcat\Admin\Show;
|
||||
use Dcat\Admin\Widgets\Box;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class BargainActivityController extends AdminController
|
||||
{
|
||||
|
|
@ -110,7 +113,24 @@ class BargainActivityController extends AdminController
|
|||
}));
|
||||
});
|
||||
$row->column(6, function ($column) use ($activity) {
|
||||
//砍价记录-todo
|
||||
//砍价记录
|
||||
$builder = BargainOrder::where('activity_id', $activity->id)->with(['userInfo']);
|
||||
$bargainOrderGrid = Grid::make($builder, function (Grid $grid) {
|
||||
$grid->column('id', '序号');
|
||||
$grid->column('infos', '明细')->display(function () {
|
||||
return '【'.$this->userInfo->nickname.'】'.$this->created_at->format('Y-m-d H:i:s').'发起了砍价';
|
||||
})->link(function () {
|
||||
return '';
|
||||
// return admin_route('merchant_printers.show', ['merchant_printer' =>$this->id]);
|
||||
});
|
||||
|
||||
$grid->model()->orderBy('created_at', 'desc');
|
||||
|
||||
$grid->disableActions();
|
||||
$grid->disableRefreshButton();
|
||||
});
|
||||
$bargainOrderBox = Box::make('砍价记录', $bargainOrderGrid);
|
||||
$column->row($bargainOrderBox->collapsable());
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
@ -182,4 +202,18 @@ class BargainActivityController extends AdminController
|
|||
});
|
||||
});
|
||||
}
|
||||
|
||||
public function activities(Request $request)
|
||||
{
|
||||
$name = $request->input('q');
|
||||
|
||||
$query = BargainActivityModel::select('id', 'name as text');
|
||||
|
||||
if ($name) {
|
||||
$query->where('name', 'like', "%$name%");
|
||||
return $query->paginate(null);
|
||||
}
|
||||
|
||||
return response()->json($query->get());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,177 @@
|
|||
<?php
|
||||
|
||||
namespace App\Admin\Controllers;
|
||||
|
||||
use App\Admin\Repositories\BargainOrder;
|
||||
use App\Models\BargainOrder as BargainOrderModel;
|
||||
use App\Models\BargainOrderLog;
|
||||
use Dcat\Admin\Admin;
|
||||
use Dcat\Admin\Form;
|
||||
use Dcat\Admin\Grid;
|
||||
use Dcat\Admin\Http\Controllers\AdminController;
|
||||
use Dcat\Admin\Layout\Row;
|
||||
use Dcat\Admin\Show;
|
||||
use Dcat\Admin\Widgets\Box;
|
||||
|
||||
class BargainOrderController extends AdminController
|
||||
{
|
||||
/**
|
||||
* Make a grid builder.
|
||||
*
|
||||
* @return Grid
|
||||
*/
|
||||
protected function grid()
|
||||
{
|
||||
$builder = BargainOrder::with(['activity', 'user', 'userInfo', 'mallOrder', 'sku']);
|
||||
return Grid::make($builder, function (Grid $grid) {
|
||||
$grid->column('id')->sortable();
|
||||
$grid->column('activity.name');
|
||||
$grid->column('user.phone');
|
||||
$grid->column('userInfo.nickname');
|
||||
$grid->column('sku.name');
|
||||
$grid->column('sku_price')->display(function ($v) {
|
||||
return bcdiv($v, 100, 2);
|
||||
})->prepend('¥');
|
||||
$grid->column('bargain_price')->display(function ($v) {
|
||||
return bcdiv($v, 100, 2);
|
||||
})->prepend('¥');
|
||||
$grid->column('status');
|
||||
$grid->column('expire_at');
|
||||
$grid->column('mallOrder.sn');
|
||||
$grid->column('remark');
|
||||
$grid->column('created_at');
|
||||
$grid->column('updated_at')->sortable();
|
||||
|
||||
$grid->model()->orderBy('id', 'desc');
|
||||
|
||||
$grid->actions(function (Grid\Displayers\Actions $actions) {
|
||||
if (Admin::user()->can('dcat.admin.bargain_orders.show')) {
|
||||
$actions->append('<a style="cursor: pointer;" target="_blank" href="'.admin_route('bargain_orders.show', ['bargain_order'=>$actions->row]).'"><i class="feather icon-eye"></i> 显示 </a>');
|
||||
}
|
||||
});
|
||||
|
||||
$grid->filter(function (Grid\Filter $filter) {
|
||||
$filter->panel();
|
||||
$filter->equal('activity_id')->select()->ajax(admin_route('api.bargain_activities'))->width(3);
|
||||
$filter->equal('sku_id')->select()->ajax(admin_route('api.product_skus'))->width(3);
|
||||
$filter->like('mallOrder.sn')->width(3);
|
||||
$filter->between('created_at')->dateTime()->width(7);
|
||||
$filter->like('user.phone')->width(3);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Make a show builder.
|
||||
*
|
||||
* @param mixed $id
|
||||
*
|
||||
* @return Show
|
||||
*/
|
||||
protected function detail($id)
|
||||
{
|
||||
// return Show::make($id, new BargainOrder(), function (Show $show) {
|
||||
// $show->field('id');
|
||||
// $show->field('activity_id');
|
||||
// $show->field('user_id');
|
||||
// $show->field('sku_id');
|
||||
// $show->field('sku_price');
|
||||
// $show->field('bargain_price');
|
||||
// $show->field('status');
|
||||
// $show->field('expire_at');
|
||||
// $show->field('order_id');
|
||||
// $show->field('remark');
|
||||
// $show->field('created_at');
|
||||
// $show->field('updated_at');
|
||||
// });
|
||||
|
||||
return function (Row $row) use ($id) {
|
||||
$order = BargainOrderModel::with(['activity', 'user', 'userInfo', 'mallOrder', 'sku'])->find($id);
|
||||
$row->column(6, function ($column) use ($order) {
|
||||
$column->row(Show::make($order, function (Show $show) {
|
||||
$show->row(function (Show\Row $show) {
|
||||
$show->field('id');
|
||||
$show->width(6)->field('activity.name');
|
||||
$show->field('sku.name');
|
||||
$show->field('sku_price')->as(function ($v) {
|
||||
return bcdiv($v, 100, 2);
|
||||
})->prepend('¥');
|
||||
$show->field('bargain_price')->as(function ($v) {
|
||||
return bcdiv($v, 100, 2);
|
||||
})->prepend('¥');
|
||||
$show->field('status')->using([
|
||||
0=>'未开始',
|
||||
1=>'砍价中',
|
||||
2=>'已砍完',
|
||||
])->dot([
|
||||
0=>'primary',
|
||||
1=>'warning',
|
||||
2=>'success',
|
||||
]);
|
||||
|
||||
$show->field('mall_order.sn', '关联订单编号')->unescape()->as(function ($value) {
|
||||
if (Admin::user()->can('dcat.admin.orders.show')) {
|
||||
return '<a href="'.admin_route('orders.show', ['order'=>$this->mallOrder]).'" target="_blank">'.$value.'</a>';
|
||||
}
|
||||
return $value;
|
||||
});
|
||||
|
||||
$show->field('expire_at');
|
||||
$show->field('created_at');
|
||||
});
|
||||
$show->panel()
|
||||
->tools(function (Show\Tools $tools) {
|
||||
$tools->disableEdit();
|
||||
$tools->disableDelete();
|
||||
});
|
||||
}));
|
||||
});
|
||||
$row->column(6, function ($column) use ($id) {
|
||||
// 砍价日志列表
|
||||
$builder = BargainOrderLog::where('order_id', $id)->with(['user', 'userInfo']);
|
||||
$logGrid = Grid::make($builder, function (Grid $grid) {
|
||||
// $grid->column('id', '序号');
|
||||
$grid->column('user.phone');
|
||||
$grid->column('userInfo.nickname');
|
||||
// $grid->column('userInfo.avatar');
|
||||
$grid->column('bargain_amount', '砍一刀')->display(function ($v) {
|
||||
return bcdiv($v, 100, 2);
|
||||
})->prepend('¥');
|
||||
$grid->column('created_at');
|
||||
|
||||
$grid->model()->orderBy('created_at', 'desc');
|
||||
|
||||
$grid->disablePagination();
|
||||
$grid->disableActions();
|
||||
$grid->disableRefreshButton();
|
||||
});
|
||||
$logBox = Box::make('砍价记录', $logGrid);
|
||||
$column->row($logBox->collapsable());
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Make a form builder.
|
||||
*
|
||||
* @return Form
|
||||
*/
|
||||
protected function form()
|
||||
{
|
||||
return Form::make(new BargainOrder(), function (Form $form) {
|
||||
$form->display('id');
|
||||
$form->text('activity_id');
|
||||
$form->text('user_id');
|
||||
$form->text('sku_id');
|
||||
$form->text('sku_price');
|
||||
$form->text('bargain_price');
|
||||
$form->text('status');
|
||||
$form->text('expire_at');
|
||||
$form->text('order_id');
|
||||
$form->text('remark');
|
||||
|
||||
$form->display('created_at');
|
||||
$form->display('updated_at');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
<?php
|
||||
|
||||
namespace App\Admin\Repositories;
|
||||
|
||||
use App\Models\BargainOrder as Model;
|
||||
use Dcat\Admin\Repositories\EloquentRepository;
|
||||
|
||||
class BargainOrder extends EloquentRepository
|
||||
{
|
||||
/**
|
||||
* Model.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $eloquentClass = Model::class;
|
||||
}
|
||||
|
|
@ -216,6 +216,8 @@ Route::group([
|
|||
|
||||
//商城端-砍价活动
|
||||
$router->resource('bargain-activities', 'BargainActivityController')->names('bargain_activities');
|
||||
$router->resource('bargain-orders', 'BargainOrderController')->only(['index', 'show'])->names('bargain_orders');
|
||||
|
||||
|
||||
/** api接口 **/
|
||||
$router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories');
|
||||
|
|
@ -227,6 +229,7 @@ Route::group([
|
|||
$router->get('api/orders', 'OrderController@orders')->name('api.orders');
|
||||
$router->get('api/order-products', 'OrderController@orderProducts')->name('api.order_products');
|
||||
$router->get('api/users', 'UserController@users')->name('api.users');
|
||||
$router->get('api/bargain-activities', 'BargainActivityController@activities')->name('api.bargain_activities');
|
||||
|
||||
/** 调试接口 **/
|
||||
// $router->get('test', 'HomeController@test');
|
||||
|
|
|
|||
|
|
@ -23,11 +23,21 @@ class BargainOrder extends Model
|
|||
public const ORDER_STATUS_START = 1;
|
||||
public const ORDER_STATUS_FINISHED = 2;
|
||||
|
||||
public function activity()
|
||||
{
|
||||
return $this->belongsTo(BargainActivity::class, 'activity_id');
|
||||
}
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id');
|
||||
}
|
||||
|
||||
public function userInfo()
|
||||
{
|
||||
return $this->belongsTo(UserInfo::class, 'user_id', 'user_id');
|
||||
}
|
||||
|
||||
public function logs()
|
||||
{
|
||||
return $this->hasMany(BargainOrderLog::class, 'order_id');
|
||||
|
|
@ -38,6 +48,11 @@ class BargainOrder extends Model
|
|||
return $this->hasOne(ProductSku::class, 'id', 'sku_id');
|
||||
}
|
||||
|
||||
public function mallOrder()
|
||||
{
|
||||
return $this->belongsTo(Order::class, 'order_id');
|
||||
}
|
||||
|
||||
public function isFinished()
|
||||
{
|
||||
return $this->status == static::ORDER_STATUS_FINISHED;
|
||||
|
|
|
|||
|
|
@ -15,9 +15,14 @@ class BargainOrderLog extends Model
|
|||
'user_id', 'bargain_amount',
|
||||
];
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id');
|
||||
}
|
||||
|
||||
public function userInfo()
|
||||
{
|
||||
return $this->hasOne(UserInfo::class, 'user_id', 'user_id');
|
||||
return $this->belongsTo(UserInfo::class, 'user_id', 'user_id');
|
||||
}
|
||||
|
||||
public function getBargainAmountFormatAttribute()
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,36 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'labels' => [
|
||||
'BargainOrder' => 'BargainOrder',
|
||||
'bargain-order' => 'BargainOrder',
|
||||
],
|
||||
'fields' => [
|
||||
'activity' => [
|
||||
'name'=> '活动名称',
|
||||
],
|
||||
'sku' => [
|
||||
'name' => '商品名称',
|
||||
],
|
||||
'user'=>[
|
||||
'phone'=>'手机号',
|
||||
],
|
||||
'userInfo'=>[
|
||||
'nickname' => '昵称',
|
||||
],
|
||||
'mallOrder'=>[
|
||||
'sn'=>'订单编号',
|
||||
],
|
||||
'activity_id' => '参与活动',
|
||||
'user_id' => '发起用户',
|
||||
'sku_id' => '砍价商品',
|
||||
'sku_price' => '原价',
|
||||
'bargain_price' => '已砍价格',
|
||||
'status' => '状态',
|
||||
'expire_at' => '过期时间',
|
||||
'order_id' => '商城订单',
|
||||
'remark' => '备注',
|
||||
],
|
||||
'options' => [
|
||||
],
|
||||
];
|
||||
Loading…
Reference in New Issue