完善功能

app/admin/controller/order/WholeController.php

@@ -9,6 +9,7 @@ use app\admin\validate\order\OrderValidate;
 use app\controller\Curd;
 use app\model\Coupon;
 use app\model\Device;
+use app\model\Goods;
 use app\model\GoodsComponent;
 use app\model\Order;
 use app\model\OrderExpress;
@@ -52,6 +53,59 @@ class WholeController extends Curd
         return $this->doFormat($query, $format, $limit);
     }
 
+    protected function doSelect(array $where, string $field = null, string $order = 'desc')
+    {
+        $model = $this->model->with([
+            'sheet' => function ($query) {
+                $query->select('join_sheet_order_id', 'join_sheet_goods_id');
+            }
+        ]);
+        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;
+    }
+
+    public function afterQuery($items)
+    {
+        foreach ($items as &$item) {
+            if (!empty($item['sheet'])) {
+                $item['sheet']['goods_name'] = Goods::where('goods_id', $item['sheet']['join_sheet_goods_id'])->value('goods_name');
+            }
+        }
+
+        return $items;
+    }
+
     /**
      * @Desc 订单商品详情
      * @Author Gorden
@@ -88,11 +142,11 @@ class WholeController extends Curd
                 foreach ($components as $component) {
                     $configJson = !empty($component['goods_component_config_json']) ? json_decode($component['goods_component_config_json'], true) : [];
                     if (!empty($component['goods'])) {
-                        $supplierName = Supplier::where('supplier_id',$component['goods']['join_goods_supplier_id'])->value('supplier_name');
+                        $supplierName = Supplier::where('supplier_id', $component['goods']['join_goods_supplier_id'])->value('supplier_name');
                         $goodsArr[] = [
                             'goods_name' => $component['goods']['goods_name'],
                             'goods_cover' => getenv('STORAGE_DOMAIN') . $component['goods']['goods_cover'],
-                            'supplier_name'=>$supplierName,
+                            'supplier_name' => $supplierName,
                             'nbr' => $configJson['nbr'] ?? 0,
                         ];
                     }
@@ -154,7 +208,7 @@ class WholeController extends Curd
             $model->order_express_goods = $sheet;
             $model->order_express_type = $params['order_express_type'];
             $model->order_express_code = $params['order_express_code'];
-            $model->order_express_city = implode("-",$params['order_express_city']);
+            $model->order_express_city = implode("-", $params['order_express_city']);
             $model->order_express_address = $params['order_express_address'];
             $model->order_express_mobile = $params['order_express_mobile'];
             $model->order_express_telephone = $params['order_express_telephone'] ?? null;
@@ -165,8 +219,8 @@ class WholeController extends Curd
 
             // 15天后自动确认收货
             $redis = Redis::connection();
-            $key = Order::AUTOMATIC_RECEIPT_PREFIX . date('Ymd',strtotime("+15 days"));
-            $redis->sadd($key,$params['order_id']);
+            $key = Order::AUTOMATIC_RECEIPT_PREFIX . date('Ymd', strtotime("+15 days"));
+            $redis->sadd($key, $params['order_id']);
 
             Db::commit();
 
@@ -189,8 +243,8 @@ class WholeController extends Curd
         Db::beginTransaction();
         try {
             // 主订单
-            Order::where('order_id',$id)->update(['order_status_system'=>'CONFIRM']);
-        }catch (\Exception $e){
+            Order::where('order_id', $id)->update(['order_status_system' => 'CONFIRM']);
+        } catch (\Exception $e) {
 
         }
     }

app/admin/controller/sys_manage/QuestionController.php

@@ -36,11 +36,53 @@ class QuestionController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['content_category'] = 'WELLNESSQUESTION';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'content_sort';
+        $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' => function ($query) {
+                $query->select('category_id', 'category_name');
+            }
+        ]);
+        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;
+    }
+
     public function afterQuery($items)
     {
         foreach ($items as &$item) {

app/admin/controller/sys_manage/TaskController.php

@@ -6,6 +6,7 @@ use app\admin\validate\sys_manage\TaskValidate;
 use app\controller\Curd;
 use app\model\Appointment;
 use app\model\OrderSheet;
+use app\model\SysCategory;
 use app\model\Task;
 use app\model\TaskProcess;
 use support\Db;
@@ -48,7 +49,8 @@ class TaskController extends Curd
             },
             'user' => function ($query) {
                 $query->select('user_name', 'user_login_name', 'user_id');
-            }
+            },
+            'cert'
         ]);
         foreach ($where as $column => $value) {
             if (is_array($value)) {
@@ -105,7 +107,9 @@ class TaskController extends Curd
             },
             'user' => function ($query) {
                 $query->select('user_name', 'user_login_name', 'user_id');
-            }
+            },
+            'memberInfo',
+            'cert'
 
         ])->where('task_id', $request->get('id'))
             ->first();
@@ -115,27 +119,42 @@ class TaskController extends Curd
         // 查订单详情
         if (!empty($data['join_task_order_id'])) {
             $order = OrderSheet::with([
-                'goods',
-                'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile');
-                }
+                'goods' => function ($query) {
+                    $query->select('goods_id', 'goods_name', 'goods_market_price', 'goods_sales_price', 'goods_status', 'join_goods_category_id', 'goods_cover');
+                },
+                'order' => function ($query) {
+                    $query->select('order_id', 'order_name', 'order_amount_total', 'order_amount_pay', 'order_category', 'order_status_system', 'order_status_payment', 'order_status_storage', 'order_addtimes');
+                },
+                'running'
             ])->where('join_sheet_order_id', $data['join_task_order_id'])
                 ->first();
             if ($order) {
                 $order->goods->goods_cover = getenv('STORAGE_DOMAIN') . $order->goods->goods_cover;
+                if (!empty($order->goods->join_goods_category_id)) {
+                    $order->goods->join_goods_category_id = SysCategory::where('category_id', $order->goods->join_goods_category_id)->value('category_name');
+                }
                 $data['order'] = $order ?? null;
             }
         }
         // 查预约详情
         if (!empty($data['join_task_appointment_id'])) {
             $appointment = Appointment::with([
-                'goods',
+                'goods' => function ($query) {
+                    $query->select('goods_id', 'goods_name', 'goods_market_price', 'goods_sales_price', 'goods_status', 'join_goods_category_id', 'goods_cover');
+                },
                 'member' => function ($query) {
                     $query->select('member_id', 'member_mobile');
-                }
+                },
+                'memberInfo',
+                'cert',
+                'running'
+
             ])->where('appointment_id', $data['join_task_appointment_id'])
                 ->first();
             if ($appointment) {
+                if (!empty($appointment->goods->join_goods_category_id)) {
+                    $appointment->goods->join_goods_category_id = SysCategory::where('category_id', $appointment->goods->join_goods_category_id)->value('category_name');
+                }
                 $appointment->goods->goods_cover = getenv('STORAGE_DOMAIN') . $appointment->goods->goods_cover;
 
                 $data['appointment'] = $appointment ?? null;
@@ -208,14 +227,14 @@ class TaskController extends Curd
 
         $taskId = $request->get('id');
         $log = TaskProcess::with('user')
-            ->where('join_process_task_id',$taskId)
+            ->where('join_process_task_id', $taskId)
             ->get()
             ->toArray();
 
-        foreach ($log as &$item){
-            $item['datetimes'] = $item['task_process_begin_datetimes'].' ~ '.$item['task_process_end_datetimes'];
+        foreach ($log as &$item) {
+            $item['datetimes'] = $item['task_process_begin_datetimes'] . ' ~ ' . $item['task_process_end_datetimes'];
         }
 
-        return json_success('',$log);
+        return json_success('', $log);
     }
 }

app/model/Appointment.php

@@ -37,6 +37,18 @@ class Appointment extends Model
         return $this->hasOne(Member::class, 'member_id', 'join_appointment_member_id');
     }
 
+    public function memberInfo()
+    {
+        return $this->hasOne(MemberInfo::class, 'join_info_member_id', 'join_appointment_member_id')
+            ->select('join_info_member_id', 'member_info_nickname');
+    }
+
+    public function cert()
+    {
+        return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_appointment_member_id')
+            ->select('join_cert_member_id', 'member_cert_name');
+    }
+
     /**
      * @Desc 关联商品
      * @Author Gorden
@@ -61,6 +73,12 @@ class Appointment extends Model
         return $this->hasOne(Order::class, 'order_id', 'join_appointment_order_id');
     }
 
+    public function running()
+    {
+        return $this->hasOne(GoodsRunning::class, 'join_running_goods_id', 'join_appointment_goods_id')
+            ->select('join_running_goods_id', 'goods_running_storage', 'goods_running_sale');
+    }
+
     /**
      * @Desc 关联权益
      * @Author Gorden

app/model/Order.php

@@ -25,4 +25,8 @@ class Order extends Model
     {
         return $date->format('Y-m-d H:i:s');
     }
+
+    public function sheet(){
+        return $this->hasOne(OrderSheet::class,'join_sheet_order_id','order_id');
+    }
 }

app/model/OrderSheet.php

@@ -93,4 +93,10 @@ class OrderSheet extends Model
     {
         return $this->hasOne(OrderReturn::class, 'join_return_order_id', 'join_sheet_order_id');
     }
+
+    public function running()
+    {
+        return $this->hasOne(GoodsRunning::class, 'join_running_goods_id', 'join_sheet_goods_id')
+            ->select('join_running_goods_id','goods_running_storage','goods_running_sale');
+    }
 }

app/model/Task.php

@@ -58,6 +58,18 @@ class Task extends Model
         return $this->hasOne(Order::class, 'order_id', 'join_task_order_id');
     }
 
+    public function memberInfo()
+    {
+        return $this->hasOne(MemberInfo::class, 'join_info_member_id', 'join_task_apply_user_id')
+            ->select('join_info_member_id', 'member_info_nickname');
+    }
+
+    public function cert()
+    {
+        return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_task_apply_user_id')
+            ->select('join_cert_member_id', 'member_cert_name');
+    }
+
     /**
      * @Desc 关联预约
      * @Author Gorden