123

@@ -253,6 +253,11 @@ class Api extends Controller
         $cks = Db::name('order')
         $cks = Db::name('order')
             ->where(['order_no' => $data['out_trade_no']])
             ->where(['order_no' => $data['out_trade_no']])
             ->find();
             ->find();
+        if(empty($cks)){
+            $cks = Db::name('order')
+                ->where(['rebook_no' => $data['out_trade_no']])
+                ->find();
+        }
 
 
         file_put_contents("pcl_pay_logs.log", date("Y-m-d H:i:s") . "::" . json_encode($cks, JSON_UNESCAPED_UNICODE) . PHP_EOL, FILE_APPEND);
         file_put_contents("pcl_pay_logs.log", date("Y-m-d H:i:s") . "::" . json_encode($cks, JSON_UNESCAPED_UNICODE) . PHP_EOL, FILE_APPEND);
         $this->senWxmsgToDriverUser($cks['id']);
         $this->senWxmsgToDriverUser($cks['id']);

@@ -1923,7 +1923,7 @@ class Car extends Base
                 $res = Db::name("order")->where("id",$id)->update([
                 $res = Db::name("order")->where("id",$id)->update([
                     "commission_price"=>$rebook_fee,
                     "commission_price"=>$rebook_fee,
                     "rebook"=>1,
                     "rebook"=>1,
-                    "order_no" => getOrderSn(),
+                    "rebook_no" => getOrderSn(),
                     "reservation_time" => $reservation_time,
                     "reservation_time" => $reservation_time,
                 ]);
                 ]);
                 $neworder=Db::name("order")->where("id", $id)->find();
                 $neworder=Db::name("order")->where("id", $id)->find();