增加提货数量+领取时间和提货时间

app/Admin/Controllers/Area/CodeController.php

@@ -56,6 +56,9 @@ class CodeController extends AdminController
             });
         $grid->column('area.title', '地区名称');
         $grid->column('status', '状态')->using(AreaCode::STATUS);
+        $grid->column('get_at', '领取时间');
+        $grid->column('pick_at', '提货时间');
+        $grid->column('created_at', '创建时间');
         $grid->column('created_at', '创建时间');
 
 

app/Api/Controllers/Area/IndexController.php

@@ -6,6 +6,7 @@ use App\Api\Controllers\Controller;
 use App\Api\Resources\Area\AreaCodeCollection;
 use App\Api\Resources\Area\AreaResource;
 use App\Models\Area;
+use App\Models\AreaCode;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Jason\Api\Api;
@@ -90,7 +91,15 @@ class IndexController extends Controller
             })
             ->paginate();
 
-        return $this->success(new AreaCodeCollection($codes));
+        $data = [
+            'count' => [
+                'all'  => $area->areaCodes()->count(),
+                'get'  => $area->areaCodes()->where('status', AreaCode::STATUS_USED)->count(),
+                'pick' => $area->areaCodes()->where('status', AreaCode::STATUS_SIGN)->count(),
+            ],
+            'lists' => new AreaCodeCollection($codes),
+        ];
+        return $this->success($data);
     }
 
     /**

app/Api/Resources/Area/AreaCodeCollection.php

@@ -20,6 +20,8 @@ class AreaCodeCollection extends BaseCollection
                         'status' => $info->status,
                         'text'   => $info->status_text,
                     ],
+                    'get_at'    => (string) $info->get_at,
+                    'pick_at'   => (string) $info->pick_at,
                 ];
             }),
             'page' => $this->page(),

app/Models/AreaCode.php

@@ -23,6 +23,10 @@ class AreaCode extends Model
         self::STATUS_SIGN => '已核销',
     ];
 
+    public $dates=[
+        'get_at','pick_at'
+    ];
+
 
     /**
      * Notes: 生成人-管理人
@@ -58,7 +62,8 @@ class AreaCode extends Model
     {
         $this->order->state = Order::STATUS_SIGNED;
         $this->order->save();
-        $this->status = self::STATUS_SIGN;
+        $this->status  = self::STATUS_SIGN;
+        $this->pick_at = now();
         $this->save();
         return true;
     }