更新

app/Console/Commands/GetOrdersOverview.php

@@ -47,7 +47,7 @@ class GetOrdersOverview extends Command
         $before_date = date('Y-m-01 00:00:00',$time);
         $date = date('Y-m-01 00:00:00');
         //获取到所有的通过审核的项目id
-        $project_ids = Project::where('active',1)->pluck('id')->toArray();
+        $project_ids = Project::where('active',1)->where('id','>',1)->pluck('id')->toArray();
         foreach ($project_ids as $project_id)
         {
             $data = [

app/Http/Controllers/Admin/OrderOverviewController.php

@@ -49,13 +49,13 @@ class OrderOverviewController extends BaseController
     {
         if($request->input('type') == 'details') {
             $before_time = strtotime($request->input('date'));
+            $before_times = date('Y-m-d H:i:s',$before_time);
             $now = strtotime('+1 month',$before_time);
             $now = date('Y-m-d H:i:s',$now);
             $order_arr = Order::where('project_id',$request->input('project_id'))
                 ->where('status',3)
                 ->where('type',1)
-                ->where('updated_at','>=',$before_time)
-                ->where('updated_at','<',$now)
+                ->whereBetween('updated_at',[$before_times,$now])
                 ->pluck('id')->toArray();
             $items = $this->order_device->where('project_id',$request->input('project_id'))->whereIn('order_id',$order_arr);
         }else{

app/Http/Controllers/Api/mini/OrderController.php

@@ -220,6 +220,13 @@ class OrderController extends BaseController
     }
     public function getOrderDetails(Request $request)
     {
+        if ($request->input('user_id'))
+        {
+            $user = $request->input('user_id');
+        }else
+        {
+            return $this->error(['msg' => '登录的用户id缺失']);
+        }
         if ($request->input('order_sn'))
         {
             $order_sn = $request->input('order_sn');
@@ -241,6 +248,15 @@ class OrderController extends BaseController
         {
             return $this->error(['msg' => '项目id缺失']);
         }
+        $project_manager_id = Project::where('id',$project_id)->value('user_id');
+        if ($project_manager_id == $user)
+        {
+            $is_manager = true;
+        }else
+        {
+            $is_manager = false;
+
+        }
         //获取到订单总览数据
         $order_view = OrderOverviewModel::where('order_sn',$order_sn)->first();
         $order_view->date = date('Y年m月',strtotime($order_view->date));
@@ -250,13 +266,13 @@ class OrderController extends BaseController
         $order_view->status = $order_view->status ? '已确认':'未确认';
         $before_time = strtotime($dates);
         //获取订单详情
+        $before_times = date('Y-m-d H:i:s',$before_time);
         $now = strtotime('+1 month',$before_time);
         $now = date('Y-m-d H:i:s',$now);
         $order_arr = Order::where('project_id',$project_id)
             ->where('status',3)
             ->where('type',1)
-            ->where('updated_at','>=',$before_time)
-            ->where('updated_at','<',$now)
+            ->whereBetween('updated_at',[$before_times,$now])
             ->pluck('id')->toArray();
         $items = OrderDevice::where('project_id',$request->input('project_id'))->whereIn('order_id',$order_arr)->get()->toArray();
         $data = [];
@@ -269,7 +285,7 @@ class OrderController extends BaseController
             $data[$key][] = User::where('id',$user_id)->value('name');
             $data[$key][] = ($item['price']*$item['quantity'])/100;
         }
-        return $this->success(['msg' => '获取账单详情成功', 'data' => $data,'order_view' => $order_view]);
+        return $this->success(['msg' => '获取账单详情成功', 'data' => $data,'order_view' => $order_view,'is_manager'=>$is_manager]);
     }
     public function updateOrderviewStatus (Request $request)
     {