pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

1

release
panliang 2022-06-01 16:00:01 +08:00
parent d657a68aec
commit c90a503775
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Admin/Controllers/OrderController.php
View File

@ -51,7 +51,7 @@ class OrderController extends AdminController
throw new AuthorizationException('没有操作权限'); throw new AuthorizationException('没有操作权限');
} }
$query = OrderModel::with(['user.userInfo', 'products']); $query = Order::with(['user.userInfo', 'products']);
$grid = $this->grid(); $grid = $this->grid();
$grid->processFilter(); $grid->processFilter();
@ -289,7 +289,7 @@ class OrderController extends AdminController
{ {
return function (Row $row) use ($id) { return function (Row $row) use ($id) {
$row->column(5, function ($column) use ($id) { $row->column(5, function ($column) use ($id) {
$builder = OrderModel::with(['user', 'userCoupon', 'tags', 'store'])->withCount('afterSales'); $builder = Order::with(['user', 'userCoupon', 'tags', 'store'])->withCount('afterSales');
$column->row(Show::make($id, $builder, function (Show $show) { $column->row(Show::make($id, $builder, function (Show $show) {
// $show->field('id'); // $show->field('id');
$show->row(function (Show\Row $show) { $show->row(function (Show\Row $show) {
@ -366,7 +366,7 @@ class OrderController extends AdminController
$tools->disableEdit(); $tools->disableEdit();
$tools->disableDelete(); $tools->disableDelete();
if ($show->model()->status == OrderModel::STATUS_PENDING) { if ($show->model()->status == Order::STATUS_PENDING) {
if (Admin::user()->can('dcat.admin.orders.reduce')) { if (Admin::user()->can('dcat.admin.orders.reduce')) {
$tools->append(new OrderReduce()); $tools->append(new OrderReduce());
} }
@ -495,7 +495,7 @@ class OrderController extends AdminController
$column->row(Box::make('订单商品', $productGrid)); $column->row(Box::make('订单商品', $productGrid));
$packagesBox = Box::make('发货包裹', $packageGrid); $packagesBox = Box::make('发货包裹', $packageGrid);
//显示发货动作 //显示发货动作
$order = OrderModel::findOrFail($id); $order = Order::findOrFail($id);
if ($order->isWaitShipping() || $order->isShipping()) { if ($order->isWaitShipping() || $order->isShipping()) {
$packagesBox->tool(new OrderCreatePackage($id)); $packagesBox->tool(new OrderCreatePackage($id));
} }
@ -579,7 +579,7 @@ class OrderController extends AdminController
{ {
$sn = $request->input('q'); $sn = $request->input('q');
$query = OrderModel::select('id', 'sn as text'); $query = Order::select('id', 'sn as text');
if ($sn) { if ($sn) {
$query->where('sn', 'like', "%$sn%"); $query->where('sn', 'like', "%$sn%");
@ -611,7 +611,7 @@ class OrderController extends AdminController
$writer->addRow(WriterEntityFactory::createRowFromArray([ $writer->addRow(WriterEntityFactory::createRowFromArray([
'订单编号', '下单手机号', '商品编号', '商品名称', '数量', '姓名', '电话', '地址', '下单时间', '快递公司', '发货单号', '发货数量', '订单编号', '下单手机号', '商品编号', '商品名称', '数量', '姓名', '电话', '地址', '下单时间', '快递公司', '发货单号', '发货数量',
])); ]));
foreach (OrderModel::with('products', 'user')->needShipping()->cursor() as $order) { foreach (Order::with('products', 'user')->needShipping()->cursor() as $order) {
foreach ($order->products as $product) { foreach ($order->products as $product) {
if ($product->remain_quantity > 0) { if ($product->remain_quantity > 0) {
$writer->addRow(WriterEntityFactory::createRowFromArray([ $writer->addRow(WriterEntityFactory::createRowFromArray([