diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php index 1157f456..ad037fe1 100644 --- a/app/common/repositories/system/merchant/MerchantRepository.php +++ b/app/common/repositories/system/merchant/MerchantRepository.php @@ -502,7 +502,7 @@ class MerchantRepository extends BaseRepository { if ($money <= 0) return; $payType = StoreOrder::getInstance()->where('order_id', $orderId)->value('pay_type'); - if (systemConfig('mer_lock_time') || $payType == StoreGroupOrder::PAY_TYPE_CREDIT_BUY) { + if (systemConfig('mer_lock_time') ||in_array($payType,[StoreGroupOrder::PAY_TYPE_BALANCE,StoreGroupOrder::PAY_TYPE_WECHAT,StoreGroupOrder::PAY_TYPE_CREDIT_BUY])) { app()->make(UserBillRepository::class)->incBill($merId, 'mer_lock_money', $orderType, [ 'link_id' => ($orderType === 'order' ? 1 : 2) . $orderId, 'mer_id' => $merId, diff --git a/public/mer.html b/public/mer.html index 02d44981..533d0275 100644 --- a/public/mer.html +++ b/public/mer.html @@ -1 +1 @@ -