正在显示
1 个修改的文件
包含
12 行增加
和
0 行删除
| @@ -108,6 +108,7 @@ class Car extends Base | @@ -108,6 +108,7 @@ class Car extends Base | ||
| 108 | "price"=>bcmul($route['price'],$number,2), | 108 | "price"=>bcmul($route['price'],$number,2), |
| 109 | "is_pay"=>"2",//未支付 | 109 | "is_pay"=>"2",//未支付 |
| 110 | "car_id"=>$car_id, | 110 | "car_id"=>$car_id, |
| 111 | + "route_id"=>$route_id, | ||
| 111 | "user_id"=>$this->auth->id, | 112 | "user_id"=>$this->auth->id, |
| 112 | "phone"=>$phone, | 113 | "phone"=>$phone, |
| 113 | "user_name"=>$user_name, | 114 | "user_name"=>$user_name, |
| @@ -142,6 +143,7 @@ class Car extends Base | @@ -142,6 +143,7 @@ class Car extends Base | ||
| 142 | 143 | ||
| 143 | } | 144 | } |
| 144 | 145 | ||
| 146 | + | ||
| 145 | /** | 147 | /** |
| 146 | * 查询乘车人信息 | 148 | * 查询乘车人信息 |
| 147 | * @return void | 149 | * @return void |
| @@ -215,10 +217,16 @@ class Car extends Base | @@ -215,10 +217,16 @@ class Car extends Base | ||
| 215 | $w['is_pay'] = $is_pay; | 217 | $w['is_pay'] = $is_pay; |
| 216 | } | 218 | } |
| 217 | $res=Db::name("order") | 219 | $res=Db::name("order") |
| 220 | + ->alias("a") | ||
| 221 | + ->join("route b","a.route_id=b.id") | ||
| 222 | + ->field("a.*,b.start_address,b.end_address") | ||
| 218 | ->where($w) | 223 | ->where($w) |
| 219 | ->limit($page,$total) | 224 | ->limit($page,$total) |
| 220 | ->select(); | 225 | ->select(); |
| 221 | $amount=Db::name("order") | 226 | $amount=Db::name("order") |
| 227 | + ->alias("a") | ||
| 228 | + ->join("route b","a.route_id=b.id") | ||
| 229 | + ->field("a.*,b.start_address,b.end_address") | ||
| 222 | ->where($w) | 230 | ->where($w) |
| 223 | ->count(); | 231 | ->count(); |
| 224 | $data=["data"=>$res,"amount"=>$amount]; | 232 | $data=["data"=>$res,"amount"=>$amount]; |
| @@ -358,6 +366,10 @@ class Car extends Base | @@ -358,6 +366,10 @@ class Car extends Base | ||
| 358 | return $this->success("请求成功",$data); | 366 | return $this->success("请求成功",$data); |
| 359 | } | 367 | } |
| 360 | 368 | ||
| 369 | + public function selectbydriverlist(){ | ||
| 370 | + | ||
| 371 | + } | ||
| 372 | + | ||
| 361 | /** | 373 | /** |
| 362 | *认证声明 | 374 | *认证声明 |
| 363 | * @return void | 375 | * @return void |
-
请 注册 或 登录 后发表评论