From d921dd9801bbf85e19efe0a49519d0f624372164 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Tue, 11 Jun 2024 12:28:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=80=9F=E8=B4=B7=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E8=AE=B0=E8=B4=A6=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccountsTransferRecordServiceImpl.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java index 33afd74..49d1545 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java @@ -609,14 +609,30 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor dealRecord.setRemark("借贷记账借款。"); //投资账户账至储蓄卡转 dealRecord.setName(lendVo.getName()+"（"+StringUtils.getLastNumberChars(3,lendVo.getCode())+"）借款至"+debitCardVo.getName()+"（"+StringUtils.getLastNumberChars(3,debitCardVo.getCode())+"）"); + //借贷账户转账 + dealRecord.setDealCategory("9"); + dealRecord.setCreateBy(SecurityUtils.getUsername()); + dealRecord.setCreateTime(accountsTransferRecord.getCreateTime()); + //重新计算余额 + // accountsDealRecordMapper.insertAccountsDealRecord(dealRecord); + insertAccountsDealRecord(dealRecord); }else if(accountsTransferRecord.getDealType().equals("2")){ dealRecord.setDealType("2"); //实时余额 - dealRecord.setCurrentBalance(debitAccount.getBalance()-accountsTransferRecord.getCommission()); + double cB=debitAccount.getBalance(); + dealRecord.setCurrentBalance(cB+accountsTransferRecord.getCommission()); dealRecord.setRemark("借贷记账还款，本金。"); //储蓄卡还款至投资账户 dealRecord.setName(debitCardVo.getName()+"（"+StringUtils.getLastNumberChars(3,debitCardVo.getCode())+"）还款至"+lendVo.getName()+"（"+StringUtils.getLastNumberChars(3,lendVo.getCode())+"）"); + //借贷账户转账 + dealRecord.setDealCategory("9"); + dealRecord.setCreateBy(SecurityUtils.getUsername()); + dealRecord.setCreateTime(accountsTransferRecord.getCreateTime()); + //重新计算余额 + // accountsDealRecordMapper.insertAccountsDealRecord(dealRecord); + insertAccountsDealRecord(dealRecord); + AccountsDealRecord dealInterest=new AccountsDealRecord(); @@ -624,31 +640,24 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor dealInterest.setId(IdWorker.getId()); //支出金额 dealInterest.setAmount(accountsTransferRecord.getCommission()); - //实时余额 - dealInterest.setCurrentBalance(debitAccount.getBalance()); //1储蓄卡，2 信用卡，3 网贷，4 人情，5 投资账户 dealInterest.setType("3"); dealInterest.setDealType("2"); //实时余额 - dealInterest.setCurrentBalance(debitAccount.getBalance()-accountsTransferRecord.getCommission()); + dealInterest.setCurrentBalance(cB); dealInterest.setRemark("借贷记账还款，利息。"); //储蓄卡还款至投资账户 dealInterest.setName(debitCardVo.getName()+"（"+StringUtils.getLastNumberChars(3,debitCardVo.getCode())+"）还款至"+lendVo.getName()+"（"+StringUtils.getLastNumberChars(3,lendVo.getCode())+"）"); //借贷账户转账利息 dealInterest.setDealCategory("15"); - dealInterest.setCreateBy(SecurityUtils.getUsername()); - dealInterest.setCreateTime(accountsTransferRecord.getCreateTime()); + Date currentDate = accountsTransferRecord.getCreateTime(); + long millis = currentDate.getTime(); // 获取当前时间的毫秒数 + Date newDate = new Date(millis+1000); // 加上1000毫秒即1秒 + dealInterest.setCreateTime(newDate); insertAccountsDealRecord(dealInterest); } - //借贷账户转账 - dealRecord.setDealCategory("9"); - dealRecord.setCreateBy(SecurityUtils.getUsername()); - dealRecord.setCreateTime(accountsTransferRecord.getCreateTime()); - //重新计算余额 - // accountsDealRecordMapper.insertAccountsDealRecord(dealRecord); - insertAccountsDealRecord(dealRecord); } public int insertAccountsDealRecord(AccountsDealRecord accountsDealRecord)