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)); } }