更新

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

@@ -169,7 +169,7 @@ class OrderController extends BaseController
             $year = $request->input('year');
         }else
         {
-            $year = 2021;
+            return $this->error(['msg' => '筛选年份缺失']);
         }
         if ($request->input('status'))
         {
@@ -182,7 +182,7 @@ class OrderController extends BaseController
             $project_id = $request->input('project_id');
         } else
         {
-            $project_id =  38;
+            return $this->error(['msg' => '项目id缺失']);
         }
         //获取当前项目的当前年的所有月份的数据总览
         if ($status == 2)
@@ -214,28 +214,26 @@ class OrderController extends BaseController
                 $item['confirmation_time'] = $item['confirmation_time'] ?$item['confirmation_time']: '暂无';
             }
         }
-        return $this->success(['msg' => '获取订单阅读总览成功', 'data' => $items]);
+        return $this->success(['msg' => '获取订单数据总览成功', 'data' => $items]);
 
     }
     public function getOrderDetails(Request $request)
     {
-        if ($request->input('date'))
+        if ($request->input('dates'))
         {
-            $date = $request->input('date');
-            $date = $date.'-01 00:00:00';
+            $dates = $request->input('dates');
         }else
         {
-            $date = '2021-01';
-            $date = $date.'-01 00:00:00';
+            return $this->error(['msg' => '订单时间缺失']);
         }
         if ($request->input('project_id'))
         {
             $project_id = $request->input('project_id');
         }else
         {
-            $project_id = 35;
+            return $this->error(['msg' => '项目id缺失']);
         }
-        $before_time = strtotime($date);
+        $before_time = strtotime($dates);
         $now = strtotime('+1 month',$before_time);
         $now = date('Y-m-d H:i:s',$now);
         $order_arr = Order::where('project_id',$project_id)
@@ -244,17 +242,16 @@ class OrderController extends BaseController
             ->where('updated_at','>=',$before_time)
             ->where('updated_at','<',$now)
             ->pluck('id')->toArray();
-        $items = OrderDevice::where('project_id',$request->input('project_id'))->whereIn('order_id',$order_arr);
+        $items = OrderDevice::where('project_id',$request->input('project_id'))->whereIn('order_id',$order_arr)->get()->toArray();
         $data = [];
-        foreach ($items as &$item) {
+        foreach ($items as $key=>$item) {
             $device = Device::where('id',$item['device_id'])->value('name');
             $device_name = DeviceName::where('id',$item['device_name_id'])->value('name');
-            $spec_name =   Device::where('id',$item['spec_id'])->value('name');
-            $data['name'] = $device.'-'.$device_name.'-'.$spec_name;
+            $spec_name =   Spec::where('id',$item['spec_id'])->value('name');
+            $data[$key][] = $device.'-'.$device_name.'-'.$spec_name;
             $user_id = Order::where('id',$item['order_id'])->value('user_id');
-            $data['user_name'] = User::where('id',$user_id)->value('name');
-            $item->price = ($item->price*$item->quantity)/100;
-            $data['price'] = ($item['price']*$item['quantity'])/100;
+            $data[$key][] = User::where('id',$user_id)->value('name');
+            $data[$key][] = ($item['price']*$item['quantity'])/100;
         }
         return $this->success(['msg' => '获取账单详情成功', 'data' => $data]);
     }