作者 郭文星

123

@@ -113,7 +113,9 @@ class Car extends Base @@ -113,7 +113,9 @@ class Car extends Base
113 ->where("driver_id",$driver['id']) 113 ->where("driver_id",$driver['id'])
114 ->where("createtime",">",$time) 114 ->where("createtime",">",$time)
115 ->find(); 115 ->find();
  116 +
116 if(!$order_review){ 117 if(!$order_review){
  118 +
117 $order_review_id=Db::name("order_review") 119 $order_review_id=Db::name("order_review")
118 ->insertGetId([ 120 ->insertGetId([
119 "car_id"=>$car_id, 121 "car_id"=>$car_id,
@@ -122,6 +124,7 @@ class Car extends Base @@ -122,6 +124,7 @@ class Car extends Base
122 "order_status"=>1, 124 "order_status"=>1,
123 "createtime"=>time() 125 "createtime"=>time()
124 ]); 126 ]);
  127 +
125 }else{ 128 }else{
126 $order_review_id=$order_review['id']; 129 $order_review_id=$order_review['id'];
127 } 130 }
@@ -244,7 +247,7 @@ class Car extends Base @@ -244,7 +247,7 @@ class Car extends Base
244 ->join("route b","a.route_id=b.id") 247 ->join("route b","a.route_id=b.id")
245 ->field("a.*,b.start_address,b.end_address") 248 ->field("a.*,b.start_address,b.end_address")
246 ->where($w) 249 ->where($w)
247 - ->limit($page,$total) 250 + ->limit($total,$page)
248 ->select(); 251 ->select();
249 $amount=Db::name("order") 252 $amount=Db::name("order")
250 ->alias("a") 253 ->alias("a")
@@ -331,7 +334,7 @@ class Car extends Base @@ -331,7 +334,7 @@ class Car extends Base
331 */ 334 */
332 public function connect_order(){ 335 public function connect_order(){
333 $id=$this->request->param("id"); 336 $id=$this->request->param("id");
334 - $order=Db::name("order")->where("id",$id)->find(); 337 + $order=Db::name("order_review")->where("id",$id)->find();
335 if($order['order_status']==1){ 338 if($order['order_status']==1){
336 $order=Db::name("order")->where("id",$id)->update(['order_status'=>2]); 339 $order=Db::name("order")->where("id",$id)->update(['order_status'=>2]);
337 return $this->success("请求成功"); 340 return $this->success("请求成功");
@@ -345,7 +348,7 @@ class Car extends Base @@ -345,7 +348,7 @@ class Car extends Base
345 */ 348 */
346 public function have_order(){ 349 public function have_order(){
347 $id=$this->request->param("id"); 350 $id=$this->request->param("id");
348 - $order=Db::name("order")->where("id",$id)->find(); 351 + $order=Db::name("order_review")->where("id",$id)->find();
349 if($order['order_status']==2){ 352 if($order['order_status']==2){
350 $order=Db::name("order")->where("id",$id)->update(['order_status'=>3]); 353 $order=Db::name("order")->where("id",$id)->update(['order_status'=>3]);
351 return $this->success("请求成功"); 354 return $this->success("请求成功");
@@ -360,7 +363,7 @@ class Car extends Base @@ -360,7 +363,7 @@ class Car extends Base
360 */ 363 */
361 public function complete_order(){ 364 public function complete_order(){
362 $id=$this->request->param("id"); 365 $id=$this->request->param("id");
363 - $order=Db::name("order")->where("id",$id)->find(); 366 + $order=Db::name("order_review")->where("id",$id)->find();
364 if($order['order_status']==3){ 367 if($order['order_status']==3){
365 $order=Db::name("order")->where("id",$id)->update(['order_status'=>4]); 368 $order=Db::name("order")->where("id",$id)->update(['order_status'=>4]);
366 return $this->success("请求成功"); 369 return $this->success("请求成功");
@@ -377,18 +380,22 @@ class Car extends Base @@ -377,18 +380,22 @@ class Car extends Base
377 $order_status=$this->request->param("order_status"); //接送状态:1=未开始,2=接送中,3=进行中,4=已完成 380 $order_status=$this->request->param("order_status"); //接送状态:1=未开始,2=接送中,3=进行中,4=已完成
378 $page=$this->request->param("page"); 381 $page=$this->request->param("page");
379 $total=$this->request->param("total"); 382 $total=$this->request->param("total");
380 - $driver=Db::name("driver")->where("user_id",$this->auth->id)->find();  
381 - $w['driver_id'] = $driver["id"]; 383 + $driver=Db::name("driver")->where("user_id",7)->find();
  384 + $w["a.driver_id"] = $driver["id"];
382 if ($order_status!=0){ 385 if ($order_status!=0){
383 - $w['order_status'] = $order_status; 386 + $w["a.order_status"] = $order_status;
384 } 387 }
385 $res=Db::name("order_review") 388 $res=Db::name("order_review")
386 ->alias("a") 389 ->alias("a")
387 ->join("route b","a.route_id=b.id") 390 ->join("route b","a.route_id=b.id")
388 ->field("a.*,b.start_address,b.end_address") 391 ->field("a.*,b.start_address,b.end_address")
389 ->where($w) 392 ->where($w)
390 - ->limit($page,$total) 393 + ->limit($total,$page)
391 ->select(); 394 ->select();
  395 + foreach ($res as $k=>$v){
  396 + $res[$k]['price']=sprintf('%.2f',Db::name("order")->sum("price"));
  397 + $res[$k]['number']=sprintf('%.2f',Db::name("order")->sum("number"));
  398 + }
392 $amount=Db::name("order_review") 399 $amount=Db::name("order_review")
393 ->alias("a") 400 ->alias("a")
394 ->join("route b","a.route_id=b.id") 401 ->join("route b","a.route_id=b.id")
@@ -417,7 +424,7 @@ class Car extends Base @@ -417,7 +424,7 @@ class Car extends Base
417 ->join("route b","a.route_id=b.id") 424 ->join("route b","a.route_id=b.id")
418 ->field("a.*,b.start_address,b.end_address") 425 ->field("a.*,b.start_address,b.end_address")
419 ->where($w) 426 ->where($w)
420 - ->limit($page,$total) 427 + ->limit($total,$page)
421 ->select(); 428 ->select();
422 $amount=Db::name("order") 429 $amount=Db::name("order")
423 ->alias("a") 430 ->alias("a")