Merge branch 'master' into dev

biz-ghs/order/services/OrderService.php

@@ -871,7 +871,7 @@ class OrderService extends BaseService
             $order->debtPrice = $order->orderPrice ?? 0;
         }
         $order->payStatus = 1;
-        if ($order->payTime == '0000-00-00 00:00:00') {
+        if (!isset($order->payTime) || $order->payTime == '0000-00-00 00:00:00') {
             $order->payTime = date("Y-m-d H:i:s");
         }
         $order->save();