郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 ab6dfd345d8ffc2fedff60f83b23cebc7ce51576 1 个父辈 39a2d773

123

内嵌 并排对比
正在显示 2 个修改的文件 包含 5 行增加 和 1 行删除
@@ -109,10 +109,12 @@ class Car extends Backend @@ -109,10 +109,12 @@ class Car extends Backend
109 $route=Db::name("route")->where("id",$params['route_id'])->find(); 109 $route=Db::name("route")->where("id",$params['route_id'])->find();
110 $driver=Db::name("driver")->where("id",$params['driver_id'])->find(); 110 $driver=Db::name("driver")->where("id",$params['driver_id'])->find();
111 $result = $this->model->allowField(true)->save($params); 111 $result = $this->model->allowField(true)->save($params);
  112 + $carmodel=Db::name("carmodel")->where("id",$params['carmodel_id'])->find();
112 $index=new Index(); 113 $index=new Index();
113 $data=[ 114 $data=[
114 "start_address"=>$route["start_address"], 115 "start_address"=>$route["start_address"],
115 "end_address"=>$route["end_address"], 116 "end_address"=>$route["end_address"],
  117 + "price"=>$route["intercity_price"],
116 "name"=>$driver["name"], 118 "name"=>$driver["name"],
117 "driver_id"=>$driver["id"], 119 "driver_id"=>$driver["id"],
118 "route_id"=>$route["id"], 120 "route_id"=>$route["id"],
@@ -172,9 +174,11 @@ class Car extends Backend @@ -172,9 +174,11 @@ class Car extends Backend
172 $index=new Index(); 174 $index=new Index();
173 $route=Db::name("route")->where("id",$params['route_id'])->find(); 175 $route=Db::name("route")->where("id",$params['route_id'])->find();
174 $driver=Db::name("driver")->where("id",$params['driver_id'])->find(); 176 $driver=Db::name("driver")->where("id",$params['driver_id'])->find();
  177 + $carmodel=Db::name("carmodel")->where("id",$params['carmodel_id'])->find();
175 $data=[ 178 $data=[
176 "start_address"=>$route["start_address"], 179 "start_address"=>$route["start_address"],
177 "end_address"=>$route["end_address"], 180 "end_address"=>$route["end_address"],
  181 + "price"=>$route["intercity_price"],
178 "name"=>$driver["name"], 182 "name"=>$driver["name"],
179 "driver_id"=>$driver["id"], 183 "driver_id"=>$driver["id"],
180 "route_id"=>$route["id"], 184 "route_id"=>$route["id"],
@@ -1086,7 +1086,7 @@ class Car extends Base @@ -1086,7 +1086,7 @@ class Car extends Base
1086 ->alias("a") 1086 ->alias("a")
1087 ->join("route b","a.route_id=b.id") 1087 ->join("route b","a.route_id=b.id")
1088 ->field("a.*,b.start_address,b.end_address") 1088 ->field("a.*,b.start_address,b.end_address")
1089 - ->where("driver_id",$driver["id"]) 1089 + ->where("a.driver_id",$driver["id"])
1090 ->where("is_qrcode",1) 1090 ->where("is_qrcode",1)
1091 ->where("a.create_time",">",$start_time) 1091 ->where("a.create_time",">",$start_time)
1092 ->where("a.create_time","<",$end_time) 1092 ->where("a.create_time","<",$end_time)