From 528635aeb70c25b77c0768a519872f2f3a84f2b2 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Mon, 11 Mar 2024 10:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BD=99=E9=A2=9D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=EF=BC=8C=E5=86=BB=E7=BB=93=E8=AE=A2=E5=8D=95=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/store/order/StoreGroupOrder.php               | 1 +
 app/common/repositories/system/merchant/MerchantRepository.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/common/model/store/order/StoreGroupOrder.php b/app/common/model/store/order/StoreGroupOrder.php
index 337a3c89..38bf61a3 100755
--- a/app/common/model/store/order/StoreGroupOrder.php
+++ b/app/common/model/store/order/StoreGroupOrder.php
@@ -26,6 +26,7 @@ class StoreGroupOrder extends BaseModel
     const PAY_TYPE_ROUTINE = 2; //小程序支付
     const PAY_TYPE_H5 = 3; //H5支付
     const PAY_TYPE_CREDIT_BUY = 8; //信用购 先货后款
+    const PAY_TYPE_MER_BALANCE = 9; //商户余额支付
     const ON_LINE_PRODUCT = 9; //线上铺货
     const ENTITY_PRODUCT = 10; //实体铺货
     const ON_CREDIT_PRODUCT = 11; //赊账进货
diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 52f1b8ae..db28a4cf 100755
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -509,7 +509,7 @@ class MerchantRepository extends BaseRepository
     {
         if ($money <= 0) return;
         $payType = StoreOrder::getInstance()->where('order_id', $orderId)->value('pay_type');
-        if (systemConfig('mer_lock_time') ||in_array($payType,[StoreGroupOrder::PAY_TYPE_BALANCE,StoreGroupOrder::PAY_TYPE_WECHAT,StoreGroupOrder::PAY_TYPE_CREDIT_BUY])) {
+        if (systemConfig('mer_lock_time') ||in_array($payType,[StoreGroupOrder::PAY_TYPE_BALANCE, StoreGroupOrder::PAY_TYPE_MER_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,