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

转到一个项目

作者 郭文星
提交 893f60c96792c1258c2c3e1add9cd150e39d2e3b 1 个父辈 b5bca07f

123

内嵌 并排对比
正在显示 1 个修改的文件 包含 11 行增加 和 6 行删除
@@ -601,6 +601,9 @@ class Car extends Base @@ -601,6 +601,9 @@ class Car extends Base
601 $rs2 = Db::name('order') 601 $rs2 = Db::name('order')
602 ->where(['id' => $order['id']]) 602 ->where(['id' => $order['id']])
603 ->update($relogs); 603 ->update($relogs);
  604 + $index=new Index();
  605 + $index->refundToDriverUser($id);
  606 + $this->success("退款成功");
604 } 607 }
605 //$this->error("该订单无法退款"); 608 //$this->error("该订单无法退款");
606 //拼接退款参数 609 //拼接退款参数
@@ -980,7 +983,8 @@ class Car extends Base @@ -980,7 +983,8 @@ class Car extends Base
980 $route_id = $this->request->param("route_id");//线路 983 $route_id = $this->request->param("route_id");//线路
981 $number = $this->request->param("number");//乘车人数 984 $number = $this->request->param("number");//乘车人数
982 $reservation_time = $this->request->param("reservation_time");//预约时间 985 $reservation_time = $this->request->param("reservation_time");//预约时间
983 - $reservation_time = strtotime($reservation_time); 986 + $departure_time=substr($reservation_time,0,16);
  987 + $departure_time = strtotime($departure_time);
984 $phone = $this->request->param("phone");//联系电话 988 $phone = $this->request->param("phone");//联系电话
985 $carmodel_id = $this->request->param("carmodel_id");//车型id 989 $carmodel_id = $this->request->param("carmodel_id");//车型id
986 $charter_num = $this->request->param("charter_num");//包车数量 990 $charter_num = $this->request->param("charter_num");//包车数量
@@ -1026,7 +1030,7 @@ class Car extends Base @@ -1026,7 +1030,7 @@ class Car extends Base
1026 $data = [ 1030 $data = [
1027 "order_no" => getOrderSn(), 1031 "order_no" => getOrderSn(),
1028 "price" => $price, 1032 "price" => $price,
1029 - "departure_time" => $reservation_time, 1033 + "departure_time" => $departure_time,
1030 "reservation_time" => $reservation_time, 1034 "reservation_time" => $reservation_time,
1031 "is_pay" => "2",//未支付 1035 "is_pay" => "2",//未支付
1032 "route_id" => $route_id, 1036 "route_id" => $route_id,
@@ -1044,7 +1048,7 @@ class Car extends Base @@ -1044,7 +1048,7 @@ class Car extends Base
1044 $data = [ 1048 $data = [
1045 "order_no" => getOrderSn(), 1049 "order_no" => getOrderSn(),
1046 "price" => $price, 1050 "price" => $price,
1047 - "departure_time" => $reservation_time, 1051 + "departure_time" => $departure_time,
1048 "reservation_time" => $reservation_time, 1052 "reservation_time" => $reservation_time,
1049 "is_pay" => 2,//未支付 1053 "is_pay" => 2,//未支付
1050 "route_id" => $route_id, 1054 "route_id" => $route_id,
@@ -1085,7 +1089,8 @@ class Car extends Base @@ -1085,7 +1089,8 @@ class Car extends Base
1085 $route_id = $this->request->param("route_id");//线路 1089 $route_id = $this->request->param("route_id");//线路
1086 $number = $this->request->param("number");//乘车人数 1090 $number = $this->request->param("number");//乘车人数
1087 $reservation_time = $this->request->param("reservation_time");//预约时间 1091 $reservation_time = $this->request->param("reservation_time");//预约时间
1088 - $reservation_time = strtotime($reservation_time); 1092 + $departure_time=substr($reservation_time,0,16);
  1093 + $departure_time = strtotime($departure_time);
1089 $phone = $this->request->param("phone");//联系电话 1094 $phone = $this->request->param("phone");//联系电话
1090 $carmodel_id = $this->request->param("carmodel_id");//车型id 1095 $carmodel_id = $this->request->param("carmodel_id");//车型id
1091 $charter_num = $this->request->param("charter_num");//包车数量 1096 $charter_num = $this->request->param("charter_num");//包车数量
@@ -1132,7 +1137,7 @@ class Car extends Base @@ -1132,7 +1137,7 @@ class Car extends Base
1132 $data = [ 1137 $data = [
1133 "order_no" => getOrderSn(), 1138 "order_no" => getOrderSn(),
1134 "price" => $price, 1139 "price" => $price,
1135 - "departure_time" => $reservation_time, 1140 + "departure_time" => $departure_time,
1136 "order_review_id" => $order_review_id, 1141 "order_review_id" => $order_review_id,
1137 "reservation_time" => $reservation_time, 1142 "reservation_time" => $reservation_time,
1138 "is_pay" => 1,//未支付 1143 "is_pay" => 1,//未支付
@@ -1154,7 +1159,7 @@ class Car extends Base @@ -1154,7 +1159,7 @@ class Car extends Base
1154 "reservation_time" => $reservation_time, 1159 "reservation_time" => $reservation_time,
1155 "is_pay" => 2,//未支付 1160 "is_pay" => 2,//未支付
1156 "route_id" => $route_id, 1161 "route_id" => $route_id,
1157 - "departure_time" => $reservation_time, 1162 + "departure_time" => $departure_time,
1158 "user_id" => $this->auth->id, 1163 "user_id" => $this->auth->id,
1159 "phone" => $phone, 1164 "phone" => $phone,
1160 "pay_type" => "offlinepay", 1165 "pay_type" => "offlinepay",