...
|
...
|
@@ -113,7 +113,9 @@ class Car extends Base |
|
|
->where("driver_id",$driver['id'])
|
|
|
->where("createtime",">",$time)
|
|
|
->find();
|
|
|
|
|
|
if(!$order_review){
|
|
|
|
|
|
$order_review_id=Db::name("order_review")
|
|
|
->insertGetId([
|
|
|
"car_id"=>$car_id,
|
...
|
...
|
@@ -122,6 +124,7 @@ class Car extends Base |
|
|
"order_status"=>1,
|
|
|
"createtime"=>time()
|
|
|
]);
|
|
|
|
|
|
}else{
|
|
|
$order_review_id=$order_review['id'];
|
|
|
}
|
...
|
...
|
@@ -244,7 +247,7 @@ class Car extends Base |
|
|
->join("route b","a.route_id=b.id")
|
|
|
->field("a.*,b.start_address,b.end_address")
|
|
|
->where($w)
|
|
|
->limit($page,$total)
|
|
|
->limit($total,$page)
|
|
|
->select();
|
|
|
$amount=Db::name("order")
|
|
|
->alias("a")
|
...
|
...
|
@@ -331,7 +334,7 @@ class Car extends Base |
|
|
*/
|
|
|
public function connect_order(){
|
|
|
$id=$this->request->param("id");
|
|
|
$order=Db::name("order")->where("id",$id)->find();
|
|
|
$order=Db::name("order_review")->where("id",$id)->find();
|
|
|
if($order['order_status']==1){
|
|
|
$order=Db::name("order")->where("id",$id)->update(['order_status'=>2]);
|
|
|
return $this->success("请求成功");
|
...
|
...
|
@@ -345,7 +348,7 @@ class Car extends Base |
|
|
*/
|
|
|
public function have_order(){
|
|
|
$id=$this->request->param("id");
|
|
|
$order=Db::name("order")->where("id",$id)->find();
|
|
|
$order=Db::name("order_review")->where("id",$id)->find();
|
|
|
if($order['order_status']==2){
|
|
|
$order=Db::name("order")->where("id",$id)->update(['order_status'=>3]);
|
|
|
return $this->success("请求成功");
|
...
|
...
|
@@ -360,7 +363,7 @@ class Car extends Base |
|
|
*/
|
|
|
public function complete_order(){
|
|
|
$id=$this->request->param("id");
|
|
|
$order=Db::name("order")->where("id",$id)->find();
|
|
|
$order=Db::name("order_review")->where("id",$id)->find();
|
|
|
if($order['order_status']==3){
|
|
|
$order=Db::name("order")->where("id",$id)->update(['order_status'=>4]);
|
|
|
return $this->success("请求成功");
|
...
|
...
|
@@ -377,18 +380,22 @@ class Car extends Base |
|
|
$order_status=$this->request->param("order_status"); //接送状态:1=未开始,2=接送中,3=进行中,4=已完成
|
|
|
$page=$this->request->param("page");
|
|
|
$total=$this->request->param("total");
|
|
|
$driver=Db::name("driver")->where("user_id",$this->auth->id)->find();
|
|
|
$w['driver_id'] = $driver["id"];
|
|
|
$driver=Db::name("driver")->where("user_id",7)->find();
|
|
|
$w["a.driver_id"] = $driver["id"];
|
|
|
if ($order_status!=0){
|
|
|
$w['order_status'] = $order_status;
|
|
|
$w["a.order_status"] = $order_status;
|
|
|
}
|
|
|
$res=Db::name("order_review")
|
|
|
->alias("a")
|
|
|
->join("route b","a.route_id=b.id")
|
|
|
->field("a.*,b.start_address,b.end_address")
|
|
|
->where($w)
|
|
|
->limit($page,$total)
|
|
|
->limit($total,$page)
|
|
|
->select();
|
|
|
foreach ($res as $k=>$v){
|
|
|
$res[$k]['price']=sprintf('%.2f',Db::name("order")->sum("price"));
|
|
|
$res[$k]['number']=sprintf('%.2f',Db::name("order")->sum("number"));
|
|
|
}
|
|
|
$amount=Db::name("order_review")
|
|
|
->alias("a")
|
|
|
->join("route b","a.route_id=b.id")
|
...
|
...
|
@@ -417,7 +424,7 @@ class Car extends Base |
|
|
->join("route b","a.route_id=b.id")
|
|
|
->field("a.*,b.start_address,b.end_address")
|
|
|
->where($w)
|
|
|
->limit($page,$total)
|
|
|
->limit($total,$page)
|
|
|
->select();
|
|
|
$amount=Db::name("order")
|
|
|
->alias("a")
|
...
|
...
|
|