1231

@@ -266,7 +266,10 @@ class Api extends Controller
 
 
             $order['commission_pay'] = 1;
             $order['commission_pay'] = 1;
             $rs = Db::name('order')
             $rs = Db::name('order')
-                ->where(['order_no' => $data['out_trade_no']])
+                ->where([
+                    'reservation_time' => $data['rebook_time'],
+                    'order_no' => $data['out_trade_no'],
+                ])
                 ->update($order);
                 ->update($order);
         }else if (!empty($cks) && $cks['is_pay'] == '2') {
         }else if (!empty($cks) && $cks['is_pay'] == '2') {
             //更新订单信息
             //更新订单信息

@@ -1880,8 +1880,8 @@ class Car extends Base
      * @return void
      * @return void
      */
      */
     public function countrebook(){
     public function countrebook(){
-        $id = $this->request->param("order_id");
-        $reservation_time = $this->request->param("reservation_time");//预约时间
+        $id = $this->request->param("order_id","507");
+        $reservation_time = $this->request->param("reservation_time","2024-09-10 18:00-18:30");//预约时间
         $order = Db::name("order")->where("id", $id)->find();
         $order = Db::name("order")->where("id", $id)->find();
         $departure_time=substr($reservation_time,0,16);
         $departure_time=substr($reservation_time,0,16);
         $refund_time=substr($order['reservation_time'],0,16);
         $refund_time=substr($order['reservation_time'],0,16);
@@ -1896,6 +1896,7 @@ class Car extends Base
             }else {
             }else {
                 $refund_time=strtotime($refund_time);
                 $refund_time=strtotime($refund_time);
                 $newrefund_time=$refund_time-time();
                 $newrefund_time=$refund_time-time();
+
                 if($newrefund_time<0){
                 if($newrefund_time<0){
                     $this->error("该订单无法改签，时间过期");
                     $this->error("该订单无法改签，时间过期");
                 }
                 }
@@ -1922,7 +1923,7 @@ class Car extends Base
                     "commission_price"=>$rebook_fee,
                     "commission_price"=>$rebook_fee,
                     "rebook"=>1,
                     "rebook"=>1,
                     "rebook_no" => getOrderSn(),
                     "rebook_no" => getOrderSn(),
-                    "reservation_time" => $reservation_time,
+                    "rebook_time" => $reservation_time,
                 ]);
                 ]);
                 $neworder=Db::name("order")->where("id", $id)->find();
                 $neworder=Db::name("order")->where("id", $id)->find();
                 $userinfo = Db::name('user')
                 $userinfo = Db::name('user')