|
...
|
...
|
@@ -65,8 +65,14 @@ class Order extends Backend |
|
|
|
->paginate($limit);
|
|
|
|
$res=$this->model->where("id",">",0)->update(["is_check"=>1]);
|
|
|
|
foreach ($list as $row) {
|
|
|
|
$row->visible(['id', 'order_no','phone', 'type','intended_driver_id', 'pay_type', 'price', 'is_pay', 'user_name', 'driver_name', 'pay_time', 'refund_time','reservation_time', 'create_time']);
|
|
|
|
if(!$row['driver_name']){
|
|
|
|
$row->visible(['id','driver_id', 'order_no','phone', 'type','intended_driver_id', 'pay_type', 'price', 'is_pay', 'user_name', 'driver_name', 'pay_time', 'refund_time','reservation_time', 'create_time']);
|
|
|
|
|
|
|
|
if(!$row['driver']['name']){
|
|
|
|
$row['driver_name']="未选择司机";
|
|
|
|
}else{
|
|
|
|
$row['driver_name']=$row['driver']['name'];
|
|
|
|
}
|
|
|
|
if(!$row['driver']){
|
|
|
|
$row['driver_name']="未选择司机";
|
|
|
|
}
|
|
|
|
$row->visible(['driver']);
|
|
...
|
...
|
@@ -229,27 +235,31 @@ class Order extends Backend |
|
|
|
$route = Db::name("route")->where("id", $car['route_id'])->find();
|
|
|
|
//判断总表
|
|
|
|
$time = strtotime(date("Y-m-d", time()));
|
|
|
|
$order_review = Db::name("order_review")
|
|
|
|
->where("car_id", $car["id"])
|
|
|
|
->where("route_id", $route['id'])
|
|
|
|
->where("driver_id", $driver['id'])
|
|
|
|
->where("createtime", ">", $time)
|
|
|
|
->find();
|
|
|
|
$params["order_review_id"]="";
|
|
|
|
if($car){
|
|
|
|
$order_review = Db::name("order_review")
|
|
|
|
->where("car_id", $car["id"])
|
|
|
|
->where("route_id", $route['id'])
|
|
|
|
->where("driver_id", $driver['id'])
|
|
|
|
->where("createtime", ">", $time)
|
|
|
|
->find();
|
|
|
|
|
|
|
|
if (!$order_review) {
|
|
|
|
$order_review_id = Db::name("order_review")
|
|
|
|
->insertGetId([
|
|
|
|
"car_id" => $car["id"],
|
|
|
|
"route_id" => $route['id'],
|
|
|
|
"driver_id" => $driver['id'],
|
|
|
|
"type" => 2,
|
|
|
|
"order_status" => 3,
|
|
|
|
"createtime" => time()
|
|
|
|
]);
|
|
|
|
} else {
|
|
|
|
$order_review_id = $order_review['id'];
|
|
|
|
if (!$order_review) {
|
|
|
|
$order_review_id = Db::name("order_review")
|
|
|
|
->insertGetId([
|
|
|
|
"car_id" => $car["id"],
|
|
|
|
"route_id" => $route['id'],
|
|
|
|
"driver_id" => $driver['id'],
|
|
|
|
"type" => 2,
|
|
|
|
"order_status" => 3,
|
|
|
|
"createtime" => time()
|
|
|
|
]);
|
|
|
|
} else {
|
|
|
|
$order_review_id = $order_review['id'];
|
|
|
|
}
|
|
|
|
$params["order_review_id"]=$order_review_id;
|
|
|
|
}
|
|
|
|
$params["order_review_id"]=$order_review_id;
|
|
|
|
|
|
|
|
$result = $row->allowField(true)->save($params);
|
|
|
|
Db::commit();
|
|
|
|
} catch (ValidateException|PDOException|Exception $e) {
|
|
...
|
...
|
@@ -359,8 +369,12 @@ class Order extends Backend |
|
|
|
$params = $this->preExcludeFields($params);
|
|
|
|
$params['pay_type']="background";
|
|
|
|
$params['is_pay']=1;
|
|
|
|
if($params['driver_id']){
|
|
|
|
$driver=Db::name("driver")->where("id",$params['driver_id'])->find();
|
|
|
|
$car=Db::name("car")->where("driver_id",$driver['id'])->find();
|
|
|
|
$params['car_id']=$car['id'];
|
|
|
|
$params['driver_name']=$driver['name'];
|
|
|
|
}
|
|
|
|
$params['order_no']=$this->getOrderSn();
|
|
|
|
if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
|
|
|
|
$params[$this->dataLimitField] = $this->auth->id;
|
|
...
|
...
|
@@ -375,9 +389,11 @@ class Order extends Backend |
|
|
|
$this->model->validateFailException()->validate($validate);
|
|
|
|
}
|
|
|
|
|
|
|
|
$passenger=Db::name("passenger")->insertGetId(['name'=>$params['user_name'],'IDcard'=>$params['IDcard'],'phone'=>$params['phone']]);
|
|
|
|
$params['passengers']=$passenger;
|
|
|
|
|
|
|
|
|
|
|
|
//判断总表
|
|
|
|
$order_review_id="";
|
|
|
|
if($params['driver_id']){
|
|
|
|
$time = strtotime(date("Y-m-d", time()));
|
|
|
|
$order_review = Db::name("order_review")
|
|
|
|
->where("car_id", $params['car_id'])
|
|
...
|
...
|
@@ -385,7 +401,6 @@ class Order extends Backend |
|
|
|
->where("driver_id", $params['driver_id'])
|
|
|
|
->where("createtime", ">", $time)
|
|
|
|
->find();
|
|
|
|
|
|
|
|
if (!$order_review) {
|
|
|
|
$order_review_id = Db::name("order_review")
|
|
|
|
->insertGetId([
|
|
...
|
...
|
@@ -399,8 +414,55 @@ class Order extends Backend |
|
|
|
} else {
|
|
|
|
$order_review_id = $order_review['id'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$params['order_review_id']=$order_review_id;
|
|
|
|
$result = $this->model->allowField(true)->save($params);
|
|
|
|
$user=Db::name("user")->where("mobile",$params['phone'])->find();
|
|
|
|
if($user){
|
|
|
|
$params['user_id']=$user['id'];
|
|
|
|
$passenger=Db::name("passenger")->where([
|
|
|
|
'name'=>$params['user_name'],
|
|
|
|
'IDcard'=>$params['IDcard'],
|
|
|
|
'user_id'=>$params['user_id'],
|
|
|
|
'phone'=>$params['phone']
|
|
|
|
])->find();
|
|
|
|
if(!$passenger){
|
|
|
|
$passenger=Db::name("passenger")->insertGetId([
|
|
|
|
'name'=>$params['user_name'],
|
|
|
|
'IDcard'=>$params['IDcard'],
|
|
|
|
'user_id'=>$params['user_id'],
|
|
|
|
'phone'=>$params['phone']
|
|
|
|
]);
|
|
|
|
$params['passengers']=$passenger;
|
|
|
|
}else{
|
|
|
|
$params['passengers']=$passenger['id'];
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
$params['user_id']=$user['id'];
|
|
|
|
$passenger=Db::name("passenger")->where([
|
|
|
|
'name'=>$params['user_name'],
|
|
|
|
'IDcard'=>$params['IDcard'],
|
|
|
|
'user_id'=>$params['user_id'],
|
|
|
|
'phone'=>$params['phone']
|
|
|
|
])->find();
|
|
|
|
if(!$passenger){
|
|
|
|
$passenger=Db::name("passenger")->insertGetId([
|
|
|
|
'name'=>$params['user_name'],
|
|
|
|
'IDcard'=>$params['IDcard'],
|
|
|
|
'phone'=>$params['phone']
|
|
|
|
]);
|
|
|
|
$params['passengers']=$passenger;
|
|
|
|
}else{
|
|
|
|
$params['passengers']=$passenger['id'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unset($params['IDcard']);
|
|
|
|
|
|
|
|
$result = $this->model->allowField(true)->insertGetId($params);
|
|
|
|
$index=new Index();
|
|
|
|
$res=$index->senWxmsgToDriverUser($result);
|
|
|
|
print_r($res);
|
|
|
|
print_r("============");
|
|
|
|
print_r($result);return;
|
|
|
|
Db::commit();
|
|
|
|
} catch (ValidateException|PDOException|Exception $e) {
|
|
|
|
Db::rollback();
|
...
|
...
|
|
