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

转到一个项目

作者 郭文星
提交 f129124f1edab05f0ee081d7042d636b342859a4 1 个父辈 893f60c9

123

内嵌 并排对比
正在显示 1 个修改的文件 包含 12 行增加 和 1 行删除
@@ -982,6 +982,8 @@ class Car extends Base @@ -982,6 +982,8 @@ class Car extends Base
982 982
983 $route_id = $this->request->param("route_id");//线路 983 $route_id = $this->request->param("route_id");//线路
984 $number = $this->request->param("number");//乘车人数 984 $number = $this->request->param("number");//乘车人数
  985 + $starting_point = $this->request->param("starting_point");//出发位置
  986 + $end_point = $this->request->param("end_point");//到达位置
985 $reservation_time = $this->request->param("reservation_time");//预约时间 987 $reservation_time = $this->request->param("reservation_time");//预约时间
986 $departure_time=substr($reservation_time,0,16); 988 $departure_time=substr($reservation_time,0,16);
987 $departure_time = strtotime($departure_time); 989 $departure_time = strtotime($departure_time);
@@ -1037,8 +1039,9 @@ class Car extends Base @@ -1037,8 +1039,9 @@ class Car extends Base
1037 "user_id" => $this->auth->id, 1039 "user_id" => $this->auth->id,
1038 "order_review_id" => $order_review_id, 1040 "order_review_id" => $order_review_id,
1039 "phone" => $phone, 1041 "phone" => $phone,
  1042 + "starting_point" =>$starting_point,
  1043 + "end_point" => $end_point,
1040 "create_time" => time(), 1044 "create_time" => time(),
1041 -  
1042 "type" => 2, 1045 "type" => 2,
1043 "number" => $number, 1046 "number" => $number,
1044 "remarks" => $remarks, 1047 "remarks" => $remarks,
@@ -1052,6 +1055,8 @@ class Car extends Base @@ -1052,6 +1055,8 @@ class Car extends Base
1052 "reservation_time" => $reservation_time, 1055 "reservation_time" => $reservation_time,
1053 "is_pay" => 2,//未支付 1056 "is_pay" => 2,//未支付
1054 "route_id" => $route_id, 1057 "route_id" => $route_id,
  1058 + "starting_point" =>$starting_point,
  1059 + "end_point" => $end_point,
1055 "user_id" => $this->auth->id, 1060 "user_id" => $this->auth->id,
1056 "phone" => $phone, 1061 "phone" => $phone,
1057 "create_time" => time(), 1062 "create_time" => time(),
@@ -1087,6 +1092,8 @@ class Car extends Base @@ -1087,6 +1092,8 @@ class Car extends Base
1087 public function createcharterorderofflinepay() 1092 public function createcharterorderofflinepay()
1088 { 1093 {
1089 $route_id = $this->request->param("route_id");//线路 1094 $route_id = $this->request->param("route_id");//线路
  1095 + $starting_point = $this->request->param("starting_point");//出发位置
  1096 + $end_point = $this->request->param("end_point");//到达位置
1090 $number = $this->request->param("number");//乘车人数 1097 $number = $this->request->param("number");//乘车人数
1091 $reservation_time = $this->request->param("reservation_time");//预约时间 1098 $reservation_time = $this->request->param("reservation_time");//预约时间
1092 $departure_time=substr($reservation_time,0,16); 1099 $departure_time=substr($reservation_time,0,16);
@@ -1141,6 +1148,8 @@ class Car extends Base @@ -1141,6 +1148,8 @@ class Car extends Base
1141 "order_review_id" => $order_review_id, 1148 "order_review_id" => $order_review_id,
1142 "reservation_time" => $reservation_time, 1149 "reservation_time" => $reservation_time,
1143 "is_pay" => 1,//未支付 1150 "is_pay" => 1,//未支付
  1151 + "starting_point" =>$starting_point,
  1152 + "end_point" => $end_point,
1144 "route_id" => $route_id, 1153 "route_id" => $route_id,
1145 "user_id" => $this->auth->id, 1154 "user_id" => $this->auth->id,
1146 "phone" => $phone, 1155 "phone" => $phone,
@@ -1158,6 +1167,8 @@ class Car extends Base @@ -1158,6 +1167,8 @@ class Car extends Base
1158 "price" => $price, 1167 "price" => $price,
1159 "reservation_time" => $reservation_time, 1168 "reservation_time" => $reservation_time,
1160 "is_pay" => 2,//未支付 1169 "is_pay" => 2,//未支付
  1170 + "starting_point" =>$starting_point,
  1171 + "end_point" => $end_point,
1161 "route_id" => $route_id, 1172 "route_id" => $route_id,
1162 "departure_time" => $departure_time, 1173 "departure_time" => $departure_time,
1163 "user_id" => $this->auth->id, 1174 "user_id" => $this->auth->id,