Browse Source

更新接口传参

ChenWuJie 4 years ago
parent
commit
5d55bd3ae8
1 changed files with 8 additions and 12 deletions
  1. 8 12
      app/Http/Controllers/Api/mini/OrderController.php

+ 8 - 12
app/Http/Controllers/Api/mini/OrderController.php

xqd xqd
@@ -241,18 +241,14 @@ 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'] ? '已确认':'未确认';
-        }
+        $order_view = OrderOverviewModel::where('order_sn',$order_sn)->first();
+        $order_view->date = date('Y年m月',strtotime($order_view->date));
+        $order_view->total_price = $order_view->total_price/100;
+        $order_view->project_id = Project::where('id',$order_view->project_id)->value('name');
+        $order_view->confirmation_time = $order_view->confirmation_time ?date('Y-m-d',date('Y-m-d',$order_view->confirmation_time)): '暂无';
+        $order_view->status = $order_view->status ? '已确认':'未确认';
         $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)
@@ -272,7 +268,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' => $order]);
+        return $this->success(['msg' => '获取账单详情成功', 'data' => $data,'order_view' => $order_view]);
     }
 
     public function update(Request $request)