feat:费用类型

This commit is contained in:
suzhuhong
2026-04-21 17:35:35 +08:00
parent 7c64c5d3d5
commit 45664ddb42

View File

@@ -747,10 +747,11 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic
if (!amountSupport){ if (!amountSupport){
throw new ServiceException(ErrorCodeEnum.WALLET_BALANCE_INSUFFICIENT); throw new ServiceException(ErrorCodeEnum.WALLET_BALANCE_INSUFFICIENT);
} }
String payNo = GenerateNoUtil.generateMillsNoWithRandom();
AccountTransferDTO accountTransferDTO ; AccountTransferDTO accountTransferDTO ;
try { try {
accountTransferDTO = walletPayInfoService.accountPay(record.getExpenseType(), record.getPayAmount(), accountTransferDTO = walletPayInfoService.accountPay(record.getExpenseType(), record.getPayAmount(),
record.getPayeeCode(), accountInfoDTO.getAccountNo(), record.getPayNo(), transRequest.getRemark()); record.getPayeeCode(), accountInfoDTO.getAccountNo(), payNo, transRequest.getRemark());
}catch (Exception e){ }catch (Exception e){
//分账失败 释放锁 //分账失败 释放锁
redisUtil.unlock(lockKey); redisUtil.unlock(lockKey);
@@ -758,6 +759,7 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,e.getMessage()); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,e.getMessage());
} }
record.setAllocationStatus(AllocationPayStatusEnum.PAYING.getStatus()); record.setAllocationStatus(AllocationPayStatusEnum.PAYING.getStatus());
record.setPayNo(payNo);
record.setRemark(transRequest.getRemark()); record.setRemark(transRequest.getRemark());
//先改为分账中 //先改为分账中
preAllocationRecordDAO.updateByPrimaryKeySelective(record); preAllocationRecordDAO.updateByPrimaryKeySelective(record);