Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、账户明细支持过期组织查询；2、软件购买加解锁异常修复；

Browse Source
This commit is contained in:
gaoqr
2025-09-30 17:29:26 +08:00
parent c292cde4f8
commit b2f004df00
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
+1 -1
View File
@@ -217,7 +217,7 @@ public class OrganAmountServiceImpl implements OrganAmountService {
public OrganAvailableAmountRespVO getManageAvailableAmount(Long organId) { public OrganAvailableAmountRespVO getManageAvailableAmount(Long organId) {
// 查询固定组织的可用金额 // 查询固定组织的可用金额
if (ObjectUtil.isNotNull(organId)) { if (ObjectUtil.isNotNull(organId)) {
organService.validOrgan(organId); organService.getOrganWithDeleted(organId);
OrganAmountDO organAmountDO = validOrganAmount(organId); OrganAmountDO organAmountDO = validOrganAmount(organId);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+2 -4
View File
@@ -184,7 +184,7 @@ public class PayOrderServiceImpl implements PayOrderService {
// 检查机构产品购买锁 // 检查机构产品购买锁
String purchaseLockKey = String.format(RedisKeyConstants.PRODUCT_PURCHASE_LOCK_KEY, organId, productId); 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) { if (!lockResult) {
throw new ServiceException(ORG_PRODUCT_PURCHASE_LOCK_ERROR); throw new ServiceException(ORG_PRODUCT_PURCHASE_LOCK_ERROR);
} }
@@ -241,8 +241,6 @@ public class PayOrderServiceImpl implements PayOrderService {
payOrderUnifiedReqDTO = createPayOrderUnifiedReqDTO(payOrder); payOrderUnifiedReqDTO = createPayOrderUnifiedReqDTO(payOrder);
return payHandler.unifiedOrder(payOrderUnifiedReqDTO); return payHandler.unifiedOrder(payOrderUnifiedReqDTO);
} }
// 软件购买锁解锁
redisLockUtil.redissonReleaseLock(purchaseLockKey);
return null; return null;
} catch (Throwable e) { } catch (Throwable e) {
// 系统异常，则包装成 PayException 异常抛出 // 系统异常，则包装成 PayException 异常抛出
@@ -255,7 +253,7 @@ public class PayOrderServiceImpl implements PayOrderService {
} }
} finally { } finally {
// 软件购买锁解锁 // 软件购买锁解锁
redisLockUtil.redissonReleaseLock(purchaseLockKey); redisLockUtil.releaseLock(purchaseLockKey, String.valueOf(organId));
} }
} }