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

转到一个项目

作者 郭文星
提交 5599eb919fd13faad53c801106ac80739b2903ff 1 个父辈 16f62ce7

123

内嵌 并排对比
正在显示 1 个修改的文件 包含 13 行增加 和 2 行删除
@@ -163,6 +163,7 @@ class Car extends Base @@ -163,6 +163,7 @@ class Car extends Base
163 "order_no" => getOrderSn(), 163 "order_no" => getOrderSn(),
164 "price" => $price, 164 "price" => $price,
165 "reservation_time" => $reservation_time, 165 "reservation_time" => $reservation_time,
  166 + "departure_time" => $reservation_time,
166 "starting_point" => $starting_point,//未支付 167 "starting_point" => $starting_point,//未支付
167 "end_point" => $end_point,//未支付 168 "end_point" => $end_point,//未支付
168 "passengers" => $passengers,//未支付 169 "passengers" => $passengers,//未支付
@@ -1019,6 +1020,7 @@ class Car extends Base @@ -1019,6 +1020,7 @@ class Car extends Base
1019 $data = [ 1020 $data = [
1020 "order_no" => getOrderSn(), 1021 "order_no" => getOrderSn(),
1021 "price" => $price, 1022 "price" => $price,
  1023 + "departure_time" => $reservation_time,
1022 "reservation_time" => $reservation_time, 1024 "reservation_time" => $reservation_time,
1023 "is_pay" => "2",//未支付 1025 "is_pay" => "2",//未支付
1024 "route_id" => $route_id, 1026 "route_id" => $route_id,
@@ -1036,6 +1038,7 @@ class Car extends Base @@ -1036,6 +1038,7 @@ class Car extends Base
1036 $data = [ 1038 $data = [
1037 "order_no" => getOrderSn(), 1039 "order_no" => getOrderSn(),
1038 "price" => $price, 1040 "price" => $price,
  1041 + "departure_time" => $reservation_time,
1039 "reservation_time" => $reservation_time, 1042 "reservation_time" => $reservation_time,
1040 "is_pay" => 2,//未支付 1043 "is_pay" => 2,//未支付
1041 "route_id" => $route_id, 1044 "route_id" => $route_id,
@@ -1123,6 +1126,7 @@ class Car extends Base @@ -1123,6 +1126,7 @@ class Car extends Base
1123 $data = [ 1126 $data = [
1124 "order_no" => getOrderSn(), 1127 "order_no" => getOrderSn(),
1125 "price" => $price, 1128 "price" => $price,
  1129 + "departure_time" => $reservation_time,
1126 "order_review_id" => $order_review_id, 1130 "order_review_id" => $order_review_id,
1127 "reservation_time" => $reservation_time, 1131 "reservation_time" => $reservation_time,
1128 "is_pay" => 1,//未支付 1132 "is_pay" => 1,//未支付
@@ -1144,6 +1148,7 @@ class Car extends Base @@ -1144,6 +1148,7 @@ class Car extends Base
1144 "reservation_time" => $reservation_time, 1148 "reservation_time" => $reservation_time,
1145 "is_pay" => 2,//未支付 1149 "is_pay" => 2,//未支付
1146 "route_id" => $route_id, 1150 "route_id" => $route_id,
  1151 + "departure_time" => $reservation_time,
1147 "user_id" => $this->auth->id, 1152 "user_id" => $this->auth->id,
1148 "phone" => $phone, 1153 "phone" => $phone,
1149 "pay_type" => "offlinepay", 1154 "pay_type" => "offlinepay",
@@ -1177,7 +1182,8 @@ class Car extends Base @@ -1177,7 +1182,8 @@ class Car extends Base
1177 $number = $this->request->param("number");//乘车人数 1182 $number = $this->request->param("number");//乘车人数
1178 $carmodel_id = $this->request->param("carmodel_id");//乘车人数 1183 $carmodel_id = $this->request->param("carmodel_id");//乘车人数
1179 $reservation_time = $this->request->param("reservation_time");//预约时间 1184 $reservation_time = $this->request->param("reservation_time");//预约时间
1180 - //$reservation_time = strtotime($reservation_time); 1185 + $departure_time=strstr($reservation_time,"-",true);
  1186 + $departure_time = strtotime($departure_time);
1181 $phone = $this->request->param("phone");//联系电话 1187 $phone = $this->request->param("phone");//联系电话
1182 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机 1188 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机
1183 $remarks = $this->request->param("remarks");//备注 1189 $remarks = $this->request->param("remarks");//备注
@@ -1219,6 +1225,7 @@ class Car extends Base @@ -1219,6 +1225,7 @@ class Car extends Base
1219 $data = [ 1225 $data = [
1220 "order_no" => getOrderSn(), 1226 "order_no" => getOrderSn(),
1221 "price" => $price, 1227 "price" => $price,
  1228 + "departure_time" => $departure_time,
1222 "position" => $position, 1229 "position" => $position,
1223 "starting_point" => $starting_point, 1230 "starting_point" => $starting_point,
1224 "end_point" => $end_point, 1231 "end_point" => $end_point,
@@ -1246,6 +1253,7 @@ class Car extends Base @@ -1246,6 +1253,7 @@ class Car extends Base
1246 "position" => $position, 1253 "position" => $position,
1247 "starting_point" => $starting_point, 1254 "starting_point" => $starting_point,
1248 "end_point" => $end_point, 1255 "end_point" => $end_point,
  1256 + "departure_time" => $departure_time,
1249 "passengers" => $passengers, 1257 "passengers" => $passengers,
1250 "is_qrcode" => $is_qrcode, 1258 "is_qrcode" => $is_qrcode,
1251 "specificaddress_id" => $specificaddress_id, 1259 "specificaddress_id" => $specificaddress_id,
@@ -1299,7 +1307,8 @@ class Car extends Base @@ -1299,7 +1307,8 @@ class Car extends Base
1299 $number = $this->request->param("number");//乘车人数 1307 $number = $this->request->param("number");//乘车人数
1300 $carmodel_id = $this->request->param("carmodel_id");//乘车人数 1308 $carmodel_id = $this->request->param("carmodel_id");//乘车人数
1301 $reservation_time = $this->request->param("reservation_time");//预约时间 1309 $reservation_time = $this->request->param("reservation_time");//预约时间
1302 - //$reservation_time = strtotime($reservation_time); 1310 + $departure_time=strstr($reservation_time,"-",true);
  1311 + $departure_time = strtotime($departure_time);
1303 $phone = $this->request->param("phone");//联系电话 1312 $phone = $this->request->param("phone");//联系电话
1304 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机 1313 $intended_driver_id = $this->request->param("intended_driver_id");//意向司机
1305 $remarks = $this->request->param("remarks");//备注 1314 $remarks = $this->request->param("remarks");//备注
@@ -1345,6 +1354,7 @@ class Car extends Base @@ -1345,6 +1354,7 @@ class Car extends Base
1345 "order_no" => getOrderSn(), 1354 "order_no" => getOrderSn(),
1346 "price" => $price, 1355 "price" => $price,
1347 "starting_point" => $starting_point, 1356 "starting_point" => $starting_point,
  1357 + "departure_time" => $departure_time,
1348 "end_point" => $end_point, 1358 "end_point" => $end_point,
1349 "passengers" => $passengers, 1359 "passengers" => $passengers,
1350 "position" => $position, 1360 "position" => $position,
@@ -1372,6 +1382,7 @@ class Car extends Base @@ -1372,6 +1382,7 @@ class Car extends Base
1372 "starting_point" => $starting_point, 1382 "starting_point" => $starting_point,
1373 "end_point" => $end_point, 1383 "end_point" => $end_point,
1374 "passengers" => $passengers, 1384 "passengers" => $passengers,
  1385 + "departure_time" => $departure_time,
1375 "is_qrcode" => $is_qrcode, 1386 "is_qrcode" => $is_qrcode,
1376 "specificaddress_id" => $specificaddress_id, 1387 "specificaddress_id" => $specificaddress_id,
1377 "reservation_time" => $reservation_time, 1388 "reservation_time" => $reservation_time,