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

转到一个项目

作者 郭文星
提交 8329237e6797f8b4fcb6de89e935ac6bf4709511 1 个父辈 b91fe7e8

123

内嵌 并排对比
正在显示 1 个修改的文件 包含 71 行增加 和 2 行删除
@@ -112,10 +112,8 @@ class Car extends Base @@ -112,10 +112,8 @@ class Car extends Base
112 $driver = Db::name("driver")->where("id", $car['driver_id'])->find(); 112 $driver = Db::name("driver")->where("id", $car['driver_id'])->find();
113 //判断总表 113 //判断总表
114 $time = strtotime(date("Y-m-d", time())); 114 $time = strtotime(date("Y-m-d", time()));
115 -  
116 $order_review = Db::name("order_review") 115 $order_review = Db::name("order_review")
117 ->where("car_id", $car_id) 116 ->where("car_id", $car_id)
118 - ->where("car_id", $car_id)  
119 ->where("route_id", $route_id) 117 ->where("route_id", $route_id)
120 ->where("driver_id", $driver['id']) 118 ->where("driver_id", $driver['id'])
121 ->where("createtime", ">", $time) 119 ->where("createtime", ">", $time)
@@ -999,15 +997,40 @@ class Car extends Base @@ -999,15 +997,40 @@ class Car extends Base
999 $remarks = $this->request->param("remarks");//备注 997 $remarks = $this->request->param("remarks");//备注
1000 $carmodel = Db::name("carmodel")->where("id", $carmodel_id)->find(); 998 $carmodel = Db::name("carmodel")->where("id", $carmodel_id)->find();
1001 $specificaddress_id = $this->request->param("specificaddress_id");//区域id 999 $specificaddress_id = $this->request->param("specificaddress_id");//区域id
  1000 + $driver= Db::name("driver")->where("id", $intended_driver_id)->find();
  1001 + $car= Db::name("car")->where("driver_id", $driver['id'])->find();
1002 $chartercar = Db::name("chartercar") 1002 $chartercar = Db::name("chartercar")
1003 ->where("specificaddress_id", $specificaddress_id) 1003 ->where("specificaddress_id", $specificaddress_id)
1004 ->where("carmodel_id", $carmodel_id) 1004 ->where("carmodel_id", $carmodel_id)
1005 ->find(); 1005 ->find();
1006 $price = 0; 1006 $price = 0;
1007 $price = bcmul($charter_num, $chartercar['price'], 2); 1007 $price = bcmul($charter_num, $chartercar['price'], 2);
  1008 + //判断总表
  1009 + $time = strtotime(date("Y-m-d", time()));
  1010 + $order_review = Db::name("order_review")
  1011 + ->where("car_id", $car["id"])
  1012 + ->where("route_id", $route_id)
  1013 + ->where("driver_id", $driver['id'])
  1014 + ->where("createtime", ">", $time)
  1015 + ->find();
  1016 +
  1017 + if (!$order_review) {
  1018 + $order_review_id = Db::name("order_review")
  1019 + ->insertGetId([
  1020 + "car_id" => $car["id"],
  1021 + "route_id" => $route_id,
  1022 + "driver_id" => $driver['id'],
  1023 + "type" => 1,
  1024 + "order_status" => 3,
  1025 + "createtime" => time()
  1026 + ]);
  1027 + } else {
  1028 + $order_review_id = $order_review['id'];
  1029 + }
1008 $data = [ 1030 $data = [
1009 "order_no" => getOrderSn(), 1031 "order_no" => getOrderSn(),
1010 "price" => $price, 1032 "price" => $price,
  1033 + "order_review_id" => $order_review_id,
1011 "reservation_time" => $reservation_time, 1034 "reservation_time" => $reservation_time,
1012 "is_pay" => 1,//未支付 1035 "is_pay" => 1,//未支付
1013 "route_id" => $route_id, 1036 "route_id" => $route_id,
@@ -1056,11 +1079,34 @@ class Car extends Base @@ -1056,11 +1079,34 @@ class Car extends Base
1056 } else { 1079 } else {
1057 $this->error("价格计算错误"); 1080 $this->error("价格计算错误");
1058 } 1081 }
  1082 + //判断总表
  1083 + $time = strtotime(date("Y-m-d", time()));
  1084 + $order_review = Db::name("order_review")
  1085 + ->where("car_id", $car["id"])
  1086 + ->where("route_id", $route_id)
  1087 + ->where("driver_id", $driver['id'])
  1088 + ->where("createtime", ">", $time)
  1089 + ->find();
  1090 +
  1091 + if (!$order_review) {
  1092 + $order_review_id = Db::name("order_review")
  1093 + ->insertGetId([
  1094 + "car_id" => $car["id"],
  1095 + "route_id" => $route_id,
  1096 + "driver_id" => $driver['id'],
  1097 + "type" => 1,
  1098 + "order_status" => 3,
  1099 + "createtime" => time()
  1100 + ]);
  1101 + } else {
  1102 + $order_review_id = $order_review['id'];
  1103 + }
1059 $data = [ 1104 $data = [
1060 "order_no" => getOrderSn(), 1105 "order_no" => getOrderSn(),
1061 "price" => $price, 1106 "price" => $price,
1062 "driver_id" => $driver['id'], 1107 "driver_id" => $driver['id'],
1063 "is_qrcode" => $is_qrcode, 1108 "is_qrcode" => $is_qrcode,
  1109 + "order_review_id" => $order_review_id,
1064 "specificaddress_id" => $specificaddress_id, 1110 "specificaddress_id" => $specificaddress_id,
1065 "reservation_time" => $reservation_time, 1111 "reservation_time" => $reservation_time,
1066 "is_pay" => "2",//未支付 1112 "is_pay" => "2",//未支付
@@ -1124,9 +1170,32 @@ class Car extends Base @@ -1124,9 +1170,32 @@ class Car extends Base
1124 } else { 1170 } else {
1125 $this->error("价格计算错误"); 1171 $this->error("价格计算错误");
1126 } 1172 }
  1173 + //判断总表
  1174 + $time = strtotime(date("Y-m-d", time()));
  1175 + $order_review = Db::name("order_review")
  1176 + ->where("car_id", $car["id"])
  1177 + ->where("route_id", $route_id)
  1178 + ->where("driver_id", $driver['id'])
  1179 + ->where("createtime", ">", $time)
  1180 + ->find();
  1181 +
  1182 + if (!$order_review) {
  1183 + $order_review_id = Db::name("order_review")
  1184 + ->insertGetId([
  1185 + "car_id" => $car["id"],
  1186 + "route_id" => $route_id,
  1187 + "driver_id" => $driver['id'],
  1188 + "type" => 1,
  1189 + "order_status" => 3,
  1190 + "createtime" => time()
  1191 + ]);
  1192 + } else {
  1193 + $order_review_id = $order_review['id'];
  1194 + }
1127 $data = [ 1195 $data = [
1128 "order_no" => getOrderSn(), 1196 "order_no" => getOrderSn(),
1129 "price" => $price, 1197 "price" => $price,
  1198 + "order_review_id" => $order_review_id,
1130 "is_qrcode" => $is_qrcode, 1199 "is_qrcode" => $is_qrcode,
1131 "specificaddress_id" => $specificaddress_id, 1200 "specificaddress_id" => $specificaddress_id,
1132 "reservation_time" => $reservation_time, 1201 "reservation_time" => $reservation_time,