13

@@ -873,17 +873,17 @@ class Car extends Base
      * @return void
      */
     public function createcharterorder(){
+
         $route_id = $this->request->param("route_id");//线路
         $number = $this->request->param("number");//乘车人数
-        $carmodel_id = $this->request->param("carmodel_id");//乘车人数
         $reservation_time = $this->request->param("reservation_time");//预约时间
         $phone = $this->request->param("phone");//联系电话
+        $carmodel_id = $this->request->param("carmodel_id");//车型id
+        $charter_num = $this->request->param("charter_num");//包车数量
         $intended_driver_id = $this->request->param("intended_driver_id");//意向司机
         $remarks = $this->request->param("remarks");//备注
-        $driver=Db::name("driver")->where("id",$intended_driver_id)->find();
-        $car=Db::name("car")->where("driver_id",$driver['id'])->find();
         $carmodel=Db::name("carmodel")->where("id",$carmodel_id)->find();
-        $price=bcmul($number,$carmodel['price'],2);
+        $price=bcmul($charter_num,$carmodel['price'],2);
         $data=[
             "order_no"=>getOrderSn(),
             "price"=>$price,
@@ -914,8 +914,7 @@ class Car extends Base
             'openid' => $userinfo['wx_xcx_openid'],
         ];
         $f = \addons\epay\library\Service::submitOrder($params);
-        $this->success("请求成功");
-
+        $this->success("请求成功",$f);
 
     }
 
@@ -924,24 +923,24 @@ class Car extends Base
      * @return void
      */
     public function createintercityorder(){
-        $route_id = $this->request->param("route_id");//线路
         $is_qrcode = $this->request->param("is_qrcode");//二维码下单:0=不是,1=是
+        $route_id = $this->request->param("route_id");//线路
         $number = $this->request->param("number");//乘车人数
+        $carmodel_id = $this->request->param("carmodel_id");//乘车人数
         $reservation_time = $this->request->param("reservation_time");//预约时间
         $phone = $this->request->param("phone");//联系电话
-
         $intended_driver_id = $this->request->param("intended_driver_id");//意向司机
         $remarks = $this->request->param("remarks");//备注
-        $car=Db::name("car")->where("driver_id",$intended_driver_id)->find();
-        $carmodel=Db::name("carmodel")->where("id",$car["carmodel_id"])->find();
-        $price=bcmul($number,$carmodel['price'],2);
+        $driver=Db::name("driver")->where("id",$intended_driver_id)->find();
+        $car=Db::name("car")->where("driver_id",$driver['id'])->find();
+        $carmodel=Db::name("carmodel")->where("id",$carmodel_id)->find();
+        $price=bcmul($number,$carmodel['intercity_price'],2);
         $data=[
             "order_no"=>getOrderSn(),
             "price"=>$price,
             "reservation_time"=>$reservation_time,
             "is_pay"=>"2",//未支付
             "route_id"=>$route_id,
-            "is_qrcode"=>$is_qrcode,
             "user_id"=>$this->auth->id,
             "phone"=>$phone,
             "create_time"=>time(),
@@ -967,6 +966,7 @@ class Car extends Base
         ];
         $f = \addons\epay\library\Service::submitOrder($params);
         $this->success("请求成功",$f);
+
     }
 
     /**