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

转到一个项目

作者 郭文星
提交 f6261a24cea59ea056729f7abbc3711cadfc1ea6 1 个父辈 7705b516

123

内嵌 并排对比
正在显示 2 个修改的文件 包含 9 行增加 和 11 行删除
@@ -171,7 +171,6 @@ class Car extends Base @@ -171,7 +171,6 @@ class Car extends Base
171 "driver_id" => $driver['id'], 171 "driver_id" => $driver['id'],
172 "driver_name" => $driver['name'], 172 "driver_name" => $driver['name'],
173 "create_time" => time(), 173 "create_time" => time(),
174 - "reservation_time" => time(),  
175 "position" => $position, 174 "position" => $position,
176 "lat" => $lat, 175 "lat" => $lat,
177 "lng" => $lng, 176 "lng" => $lng,
@@ -944,6 +943,7 @@ class Car extends Base @@ -944,6 +943,7 @@ class Car extends Base
944 $route_id = $this->request->param("route_id");//线路 943 $route_id = $this->request->param("route_id");//线路
945 $number = $this->request->param("number");//乘车人数 944 $number = $this->request->param("number");//乘车人数
946 $reservation_time = $this->request->param("reservation_time");//预约时间 945 $reservation_time = $this->request->param("reservation_time");//预约时间
  946 + $reservation_time = strtotime($reservation_time);
947 $phone = $this->request->param("phone");//联系电话 947 $phone = $this->request->param("phone");//联系电话
948 $carmodel_id = $this->request->param("carmodel_id");//车型id 948 $carmodel_id = $this->request->param("carmodel_id");//车型id
949 $charter_num = $this->request->param("charter_num");//包车数量 949 $charter_num = $this->request->param("charter_num");//包车数量
@@ -996,7 +996,7 @@ class Car extends Base @@ -996,7 +996,7 @@ class Car extends Base
996 "order_review_id" => $order_review_id, 996 "order_review_id" => $order_review_id,
997 "phone" => $phone, 997 "phone" => $phone,
998 "create_time" => time(), 998 "create_time" => time(),
999 - "reservation_time" => time(), 999 +
1000 "type" => 2, 1000 "type" => 2,
1001 "number" => $number, 1001 "number" => $number,
1002 "remarks" => $remarks, 1002 "remarks" => $remarks,
@@ -1012,7 +1012,6 @@ class Car extends Base @@ -1012,7 +1012,6 @@ class Car extends Base
1012 "user_id" => $this->auth->id, 1012 "user_id" => $this->auth->id,
1013 "phone" => $phone, 1013 "phone" => $phone,
1014 "create_time" => time(), 1014 "create_time" => time(),
1015 - "reservation_time" => time(),  
1016 "type" => 2, 1015 "type" => 2,
1017 "number" => $number, 1016 "number" => $number,
1018 "remarks" => $remarks, 1017 "remarks" => $remarks,
@@ -1047,6 +1046,7 @@ class Car extends Base @@ -1047,6 +1046,7 @@ class Car extends Base
1047 $route_id = $this->request->param("route_id");//线路 1046 $route_id = $this->request->param("route_id");//线路
1048 $number = $this->request->param("number");//乘车人数 1047 $number = $this->request->param("number");//乘车人数
1049 $reservation_time = $this->request->param("reservation_time");//预约时间 1048 $reservation_time = $this->request->param("reservation_time");//预约时间
  1049 + $reservation_time = strtotime($reservation_time);
1050 $phone = $this->request->param("phone");//联系电话 1050 $phone = $this->request->param("phone");//联系电话
1051 $carmodel_id = $this->request->param("carmodel_id");//车型id 1051 $carmodel_id = $this->request->param("carmodel_id");//车型id
1052 $charter_num = $this->request->param("charter_num");//包车数量 1052 $charter_num = $this->request->param("charter_num");//包车数量
@@ -1101,7 +1101,7 @@ class Car extends Base @@ -1101,7 +1101,7 @@ class Car extends Base
1101 "phone" => $phone, 1101 "phone" => $phone,
1102 "pay_type" => "offlinepay", 1102 "pay_type" => "offlinepay",
1103 "create_time" => time(), 1103 "create_time" => time(),
1104 - "reservation_time" => time(), 1104 +
1105 "type" => 2, 1105 "type" => 2,
1106 "number" => $number, 1106 "number" => $number,
1107 "remarks" => $remarks, 1107 "remarks" => $remarks,
@@ -1118,7 +1118,6 @@ class Car extends Base @@ -1118,7 +1118,6 @@ class Car extends Base
1118 "phone" => $phone, 1118 "phone" => $phone,
1119 "pay_type" => "offlinepay", 1119 "pay_type" => "offlinepay",
1120 "create_time" => time(), 1120 "create_time" => time(),
1121 - "reservation_time" => time(),  
1122 "type" => 2, 1121 "type" => 2,
1123 "number" => $number, 1122 "number" => $number,
1124 "remarks" => $remarks, 1123 "remarks" => $remarks,
@@ -1148,6 +1147,7 @@ class Car extends Base @@ -1148,6 +1147,7 @@ class Car extends Base
1148 $number = $this->request->param("number");//乘车人数 1147 $number = $this->request->param("number");//乘车人数
1149 $carmodel_id = $this->request->param("carmodel_id");//乘车人数 1148 $carmodel_id = $this->request->param("carmodel_id");//乘车人数
1150 $reservation_time = $this->request->param("reservation_time");//预约时间 1149 $reservation_time = $this->request->param("reservation_time");//预约时间
  1150 + $reservation_time = strtotime($reservation_time);
1151 $phone = $this->request->param("phone");//联系电话 1151 $phone = $this->request->param("phone");//联系电话
1152 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机 1152 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机
1153 $remarks = $this->request->param("remarks");//备注 1153 $remarks = $this->request->param("remarks");//备注
@@ -1203,7 +1203,7 @@ class Car extends Base @@ -1203,7 +1203,7 @@ class Car extends Base
1203 "user_id" => $this->auth->id, 1203 "user_id" => $this->auth->id,
1204 "phone" => $phone, 1204 "phone" => $phone,
1205 "create_time" => time(), 1205 "create_time" => time(),
1206 - "reservation_time" => time(), 1206 +
1207 "type" => 2, 1207 "type" => 2,
1208 "number" => $number, 1208 "number" => $number,
1209 "remarks" => $remarks, 1209 "remarks" => $remarks,
@@ -1225,7 +1225,6 @@ class Car extends Base @@ -1225,7 +1225,6 @@ class Car extends Base
1225 "user_id" => $this->auth->id, 1225 "user_id" => $this->auth->id,
1226 "phone" => $phone, 1226 "phone" => $phone,
1227 "create_time" => time(), 1227 "create_time" => time(),
1228 - "reservation_time" => time(),  
1229 "type" => 2, 1228 "type" => 2,
1230 "number" => $number, 1229 "number" => $number,
1231 "remarks" => $remarks, 1230 "remarks" => $remarks,
@@ -1270,6 +1269,7 @@ class Car extends Base @@ -1270,6 +1269,7 @@ class Car extends Base
1270 $number = $this->request->param("number");//乘车人数 1269 $number = $this->request->param("number");//乘车人数
1271 $carmodel_id = $this->request->param("carmodel_id");//乘车人数 1270 $carmodel_id = $this->request->param("carmodel_id");//乘车人数
1272 $reservation_time = $this->request->param("reservation_time");//预约时间 1271 $reservation_time = $this->request->param("reservation_time");//预约时间
  1272 + $reservation_time = strtotime($reservation_time);
1273 $phone = $this->request->param("phone");//联系电话 1273 $phone = $this->request->param("phone");//联系电话
1274 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机 1274 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机
1275 $remarks = $this->request->param("remarks");//备注 1275 $remarks = $this->request->param("remarks");//备注
@@ -1328,7 +1328,6 @@ class Car extends Base @@ -1328,7 +1328,6 @@ class Car extends Base
1328 "user_id" => $this->auth->id, 1328 "user_id" => $this->auth->id,
1329 "phone" => $phone, 1329 "phone" => $phone,
1330 "create_time" => time(), 1330 "create_time" => time(),
1331 - "reservation_time" => time(),  
1332 "type" => 2, 1331 "type" => 2,
1333 "number" => $number, 1332 "number" => $number,
1334 "remarks" => $remarks, 1333 "remarks" => $remarks,
@@ -1351,7 +1350,6 @@ class Car extends Base @@ -1351,7 +1350,6 @@ class Car extends Base
1351 "user_id" => $this->auth->id, 1350 "user_id" => $this->auth->id,
1352 "phone" => $phone, 1351 "phone" => $phone,
1353 "create_time" => time(), 1352 "create_time" => time(),
1354 - "reservation_time" => time(),  
1355 "type" => 2, 1353 "type" => 2,
1356 "number" => $number, 1354 "number" => $number,
1357 "remarks" => $remarks, 1355 "remarks" => $remarks,
@@ -388,8 +388,8 @@ class WxxcxPush extends Base @@ -388,8 +388,8 @@ class WxxcxPush extends Base
388 $page = '/pageOne/moreRes/moreRes'; 388 $page = '/pageOne/moreRes/moreRes';
389 $temp='oczyQ_SabASMQRRhDedXRGUEzCAuGh1xBw8sp2HVPvQ'; 389 $temp='oczyQ_SabASMQRRhDedXRGUEzCAuGh1xBw8sp2HVPvQ';
390 $insert_message_log_data = array( 390 $insert_message_log_data = array(
391 - 'value1' => $route['start_address'],  
392 - 'value2' => $route['end_address'], 391 + 'value1' => $reservation['starting_point'],
  392 + 'value2' => $reservation['end_point'],
393 'value3' => $reservation['number'], 393 'value3' => $reservation['number'],
394 'value4' => date("Y-m-d H:i:s",$reservation['reservation_time']), 394 'value4' => date("Y-m-d H:i:s",$reservation['reservation_time']),
395 'value5' => $reservation['remarks'], 395 'value5' => $reservation['remarks'],