完善功能

app/admin/controller/order/WholeController.php

@@ -43,7 +43,7 @@ class WholeController extends Curd
     public function select(Request $request): Response
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
-        if(!empty($where['order_addtimes'])){
+        if (!empty($where['order_addtimes'])) {
             $where['order_addtimes'][0] = strtotime($where['order_addtimes'][0]);
             $where['order_addtimes'][1] = strtotime($where['order_addtimes'][1]);
         }
@@ -239,6 +239,32 @@ class WholeController extends Curd
         }
     }
 
+    public function myOrder(Request $request)
+    {
+        $memberId = $request->get('member_id', '');
+        if (!$memberId) {
+            return json_fail('查询错误');
+        }
+
+        $sheet = OrderSheet::with([
+            'goods' => function ($query) {
+                $query->select('goods_id', 'goods_name', 'goods_cover');
+            },
+            'order' => function($query){
+                $query->select('order_id','order_status_system','order_status_payment','order_status_storage');
+            }
+        ])->where('join_sheet_member_id', $memberId)
+            ->orderBy('order_sheet_addtimes', 'desc')
+            ->get()
+            ->toArray();
+        foreach ($sheet as &$item) {
+            if (!empty($item->goods->goods_cover)) {
+                $item->goods->goods_cover = getenv('STORAGE_DOMAIN') . $item->goods->goods_cover;
+            }
+        }
+        return json_success('', $sheet);
+    }
+
     // TODO 确认收货（完成订单）
     public function confirm($id)
     {

app/admin/controller/sys_manage/ProtocolController.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace app\admin\controller\sys_manage;
+
+use app\admin\validate\sys_manage\AdvValidate;
+use app\admin\validate\sys_manage\ArticleValidate;
+use app\admin\validate\sys_manage\ContentValidate;
+use app\controller\Curd;
+use app\model\Adv;
+use app\model\Article;
+use app\model\Content;
+use support\Request;
+use support\Response;
+
+class ProtocolController extends Curd
+{
+    public function __construct()
+    {
+        $this->model = new Content();
+        $this->validate = true;
+        $this->validateClass = new ContentValidate();
+    }
+
+    /** 列表
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/5 10:00
+     *
+     * @param Request $request
+     * @return Response
+     * @throws \support\exception\BusinessException
+     */
+    public function select(Request $request): Response
+    {
+        [$where, $format, $limit, $field, $order] = $this->selectInput($request);
+        $where['content_category'] = 'PROTOCOL';
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'content_addtimes';
+        $query = $this->doSelect($where, $field, $order);
+        return $this->doFormat($query, $format, $limit);
+    }
+
+    protected function doSelect(array $where, string $field = null, string $order = 'desc')
+    {
+        $model = $this->model->with('category');
+        foreach ($where as $column => $value) {
+            if (is_array($value)) {
+                if ($value[0] === 'like' || $value[0] === 'not like') {
+                    $model = $model->where($column, $value[0], "%$value[1]%");
+                } elseif (in_array($value[0], ['>', '=', '<', '<>'])) {
+                    $model = $model->where($column, $value[0], $value[1]);
+                } elseif ($value[0] == 'in' && !empty($value[1])) {
+                    $valArr = $value[1];
+                    if (is_string($value[1])) {
+                        $valArr = explode(",", trim($value[1]));
+                    }
+                    $model = $model->whereIn($column, $valArr);
+                } elseif ($value[0] == 'not in' && !empty($value[1])) {
+                    $valArr = $value[1];
+                    if (is_string($value[1])) {
+                        $valArr = explode(",", trim($value[1]));
+                    }
+                    $model = $model->whereNotIn($column, $valArr);
+                } elseif ($value[0] == 'null') {
+                    $model = $model->whereNull($column);
+                } elseif ($value[0] == 'not null') {
+                    $model = $model->whereNotNull($column);
+                } elseif ($value[0] !== '' || $value[1] !== '') {
+                    $model = $model->whereBetween($column, $value);
+                }
+            } else {
+                $model = $model->where($column, $value);
+            }
+        }
+        if ($field) {
+            $model = $model->orderBy($field, $order);
+        }
+        return $model;
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/27 10:24
+     *
+     * @param Request $request
+     * @return array
+     * @throws \support\exception\BusinessException
+     */
+    protected function insertInput(Request $request): array
+    {
+        $data = $this->inputFilter($request->post());
+        $data['content_category'] = 'PROTOCOL';
+
+        return $data;
+    }
+}

route/admin.php

@@ -166,6 +166,14 @@ Route::group('/admin', function () {
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
+        Route::group('/protocol', function () {
+            Route::get('/list', [\app\admin\controller\sys_manage\ProtocolController::class, 'select']);
+            Route::post('/add', [\app\admin\controller\sys_manage\ProtocolController::class, 'insert']);
+            Route::post('/update', [\app\admin\controller\sys_manage\ProtocolController::class, 'update']);
+            Route::delete('/delete', [\app\admin\controller\sys_manage\ProtocolController::class, 'delete']);
+        })->middleware([
+            \app\middleware\AdminAuthCheck::class
+        ]);
         Route::group('/banner', function () {
             Route::get('/list', [\app\admin\controller\sys_manage\BannerController::class, 'select']);
             Route::post('/add', [\app\admin\controller\sys_manage\BannerController::class, 'insert']);
@@ -625,6 +633,8 @@ Route::group('/admin', function () {
             Route::get('/sheet', [\app\admin\controller\order\WholeController::class, 'sheet']);
             Route::get('/update', [\app\admin\controller\order\WholeController::class, 'update']);
             Route::post('/delivery', [\app\admin\controller\order\WholeController::class, 'delivery']);
+            Route::get('/myOrder', [\app\admin\controller\order\WholeController::class, 'myOrder']);
+
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);