From b2f004df00dc828e1be600218a6d92a724fd5138 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 30 Sep 2025 17:29:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=BF=87=E6=9C=9F=E7=BB=84=E7=BB=87=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=9B2=E3=80=81=E8=BD=AF=E4=BB=B6=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E5=8A=A0=E8=A7=A3=E9=94=81=E5=BC=82=E5=B8=B8=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/funds/organamount/OrganAmountServiceImpl.java   | 2 +-
 .../imes/module/system/service/pay/PayOrderServiceImpl.java | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
index 7bdf9d16a..5e4487819 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
@@ -217,7 +217,7 @@ public class OrganAmountServiceImpl implements OrganAmountService {
     public OrganAvailableAmountRespVO getManageAvailableAmount(Long organId) {
         // 查询固定组织的可用金额
         if (ObjectUtil.isNotNull(organId)) {
-            organService.validOrgan(organId);
+            organService.getOrganWithDeleted(organId);
 
             OrganAmountDO organAmountDO = validOrganAmount(organId);
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
index e4bc15db7..3b2010d20 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
@@ -184,7 +184,7 @@ public class PayOrderServiceImpl implements PayOrderService {
 
         // 检查机构产品购买锁
         String purchaseLockKey = String.format(RedisKeyConstants.PRODUCT_PURCHASE_LOCK_KEY, organId, productId);
-        boolean lockResult = redisLockUtil.redissonLock(purchaseLockKey, chenfengCacheProperties.getLockWaitTime(), chenfengCacheProperties.getLockTimeout());
+        boolean lockResult = redisLockUtil.acquireLock(purchaseLockKey, String.valueOf(organId), chenfengCacheProperties.getLockTimeout());
         if (!lockResult) {
             throw new ServiceException(ORG_PRODUCT_PURCHASE_LOCK_ERROR);
         }
@@ -241,8 +241,6 @@ public class PayOrderServiceImpl implements PayOrderService {
                 payOrderUnifiedReqDTO = createPayOrderUnifiedReqDTO(payOrder);
                 return payHandler.unifiedOrder(payOrderUnifiedReqDTO);
             }
-            // 软件购买锁解锁
-            redisLockUtil.redissonReleaseLock(purchaseLockKey);
             return null;
         } catch (Throwable e) {
             // 系统异常，则包装成 PayException 异常抛出
@@ -255,7 +253,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             }
         } finally {
             // 软件购买锁解锁
-            redisLockUtil.redissonReleaseLock(purchaseLockKey);
+            redisLockUtil.releaseLock(purchaseLockKey, String.valueOf(organId));
         }
     }