锁客调整

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -841,7 +841,7 @@ class OrderMerchantRepository extends BaseRepository
 //            $order->save();
             Db::name('order_merchant')->where('id', $order->id)->update(['binds' => 1, 'uid' => $user->uid]);
             //锁定商户
-            if (!$user->mer_id) {
+            if (!$user->mer_id || !$user->locktime) {
                 // $user->mer_id = $order->mer_id;
                 // $user->save();
                 Db::name('user')->where('uid', $user->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);