调整商城首页

modules/Mall/Http/Controllers/Admin/StockOrderController.php

@@ -49,60 +49,35 @@ class StockOrderController extends AdminController
             });
             $filter->column(1 / 2, function (Grid\Filter $filter) {
                 $filter->between('created_at', '下单时间')->datetime();
-                $filter->equal('state', '订单状态')->select([
-                    Order::STATUS_CANCEL    => '已取消',
-                    Order::STATUS_PAID      => '待发货',
-                    Order::STATUS_DELIVERED => '已发货',
-                    Order::STATUS_SIGNED    => '已签收',
-                ]);
+                $filter->equal('state', '订单状态')->select(Order::STATUS_SAMPLE_MAP);
 
 //                $filter->between('paid_at', '付款时间')->datetime();
 //                $filter->between('expired_at', '过期时间')->datetime();
             });
         });
 
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
-            $actions->disableEdit();
-            $actions->disableDelete();
-            $actions->disableView();
-            if ($actions->row->can('pay') && $this->row->type == Order::TYPE_NORMAL) {
-                $actions->add(new Pay());
-            }
-            if ($actions->row->can('deliver')) {
-                $actions->add(new Delivered);
-            }
-        });
+        $grid->disableActions();
 
         $grid->model()->with(['shop', 'user.info']);
 
         $grid->column('order_no', '订单编号')->display(function () {
             return sprintf('<a href="%s">%s</a>', route('admin.mall.stock_orders.show', $this), $this->order_no);
         });
-//        $grid->column('shop.name', '所属店铺');
-        $grid->column('user.username', '提货用户');
-//        $grid->column('amount', '商品金额');
-//        $grid->column('freight', '运费');
+        $grid->column('user.username', '提货用户')
+            ->display(function () {
+                return $this->user->username."({$this->user->info->nickname})";
+            });
         $grid->column('qty', '提货数量')
             ->display(function () {
                 return $this->items()->sum('qty');
             });
-//        $grid->column('订单金额')->display(function () {
-//            return $this->total;
-//        });
+        $grid->column('areaCode.code', '提货码');
         $grid->column('state', '订单状态')
             ->display(function () {
                 return $this->state_text;
             })
             ->label();
-//        $grid->column('type', '订单类型')->using(Order::TYPE_MAP)->label();
-//        $grid->column('paid_at', '支付时间')->sortable();
-//        $grid->column('expired_at', '过期时间')->sortable();
-        $grid->column('versions_count', '操作日志')->link(function () {
-            return route('admin.mall.versions', [
-                'model' => get_class($this),
-                'key'   => $this->id,
-            ]);
-        }, '_self');
+        $grid->column('type', '订单类型')->using(Order::TYPE_MAP)->label();
         $grid->column('created_at', '下单时间')->sortable();
 
         $grid->disableExport(false);

modules/Mall/Models/Order.php

@@ -82,6 +82,13 @@ class Order extends Model
         self::REFUND_COMPLETED => '退款完成',
     ];
 
+    const STATUS_SAMPLE_MAP = [
+        self::STATUS_INIT      => '未付款',
+        self::STATUS_CANCEL    => '已取消',
+        self::STATUS_PAID      => '待提货',
+        self::STATUS_DELIVERED => '已提货',
+    ];
+
     const CANCEL_BY_USER   = 2; // 买家取消
     const CANCEL_BY_SELLER = 3; // 卖家取消
     const CANCEL_BY_SYSTEM = 4; // 系统取消
@@ -92,7 +99,7 @@ class Order extends Model
 
     const TYPE_MAP = [
         self::TYPE_NORMAL => '正常',
-        self::TYPE_SAMPLE => '领取',
+        self::TYPE_SAMPLE => '免费领取',
         self::TYPE_SCORE  => '积分兑换',
     ];
 
@@ -162,7 +169,11 @@ class Order extends Model
      */
     public function getStateTextAttribute(): string
     {
-        return self::STATUS_MAP[$this->state];
+        if ($this->type == self::TYPE_SAMPLE) {
+            return self::STATUS_SAMPLE_MAP[$this->state];
+        } else {
+            return self::STATUS_MAP[$this->state];
+        }
     }
 
     /**