From 2b971dab9db69bff5b370c350f908741f41669e9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 12 Dec 2023 11:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0pc=E7=AB=AF=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=95=86=E6=88=B7=E5=86=BB=E7=BB=93=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/system/merchant/MerchantRepository.php | 2 +- public/mer.html | 2 +- ...{chunk-1888ff3b.1f7dc55b.css => chunk-3cc2a258.283a637f.css} | 2 +- ...{chunk-77630b52.14ffd303.css => chunk-50fceff2.5c655b45.css} | 2 +- public/mer/js/{app.a91b5d7a.js => app.c2d4ed1f.js} | 2 +- public/mer/js/chunk-1888ff3b.28d30738.js | 1 - public/mer/js/chunk-3cc2a258.0c10c0a6.js | 1 + public/mer/js/chunk-50fceff2.717daf4a.js | 1 + public/mer/js/chunk-77630b52.7d3e8d4c.js | 1 - 9 files changed, 7 insertions(+), 7 deletions(-) rename public/mer/css/{chunk-1888ff3b.1f7dc55b.css => chunk-3cc2a258.283a637f.css} (53%) rename public/mer/css/{chunk-77630b52.14ffd303.css => chunk-50fceff2.5c655b45.css} (85%) rename public/mer/js/{app.a91b5d7a.js => app.c2d4ed1f.js} (99%) delete mode 100644 public/mer/js/chunk-1888ff3b.28d30738.js create mode 100644 public/mer/js/chunk-3cc2a258.0c10c0a6.js create mode 100644 public/mer/js/chunk-50fceff2.717daf4a.js delete mode 100644 public/mer/js/chunk-77630b52.7d3e8d4c.js 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 @@ -