更新

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

@@ -211,7 +211,7 @@ class OrderController extends BaseController
                 $item['status'] = $item['status'] ? '已确认':'未确认';
                 $item['confirmation_user_id'] = User::where('id',$item['confirmation_user_id'])->value('name');
                 $item['project_id'] = Project::where('id',$item['project_id'])->value('name');
-                $item['confirmation_time'] = $item['confirmation_time'] ?$item['confirmation_time']: '暂无';
+                $item['confirmation_time'] = $item['confirmation_time'] ?date('Y-m-d',$item['confirmation_time']): '暂无';
             }
         }
         return $this->success(['msg' => '获取订单数据总览成功', 'data' => $items]);
@@ -219,6 +219,13 @@ class OrderController extends BaseController
     }
     public function getOrderDetails(Request $request)
     {
+        if ($request->input('order_sn'))
+        {
+            $order_sn = $request->input('order_sn');
+        }else
+        {
+            return $this->error(['msg' => '订单号缺失']);
+        }
         if ($request->input('dates'))
         {
             $dates = $request->input('dates');
@@ -233,6 +240,18 @@ class OrderController extends BaseController
         {
             return $this->error(['msg' => '项目id缺失']);
         }
+        //获取到订单总览数据
+        $order_view = OrderOverviewModel::where('order_sn',$order_sn)->get()->toArray();
+        $order =[];
+        foreach ($order_view as $key=>$value)
+        {
+            $order[$key][] = $value['order_sn'];
+            $order[$key][] = date('Y年m月',strtotime($value['date']));
+            $order[$key][] = $value['total_price']/100;
+            $order[$key][] = Project::where('id',$value['project_id'])->value('name');
+            $order[$key][] = $value['confirmation_time'] ?date('Y-m-d',$value['confirmation_time']): '暂无';
+            $order[$key][] = $value['status'] ? '已确认':'未确认';
+        }
         $before_time = strtotime($dates);
         $now = strtotime('+1 month',$before_time);
         $now = date('Y-m-d H:i:s',$now);
@@ -253,7 +272,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]);
+        return $this->success(['msg' => '获取账单详情成功', 'data' => $data,'order' => $order]);
     }
 
     public function update(Request $request)