fix: 钱包供应商财务1

陶杰

2024-10-21 ddca8e96ee1aa47ba33fcf3a9a1e7e964d63ad8b

 src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java

@@ -215,7 +215,21 @@

        //审批通过之后写转账信息
        if (Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())) {
            RLock recordLock = redissonClient.getLock(String.format(LockConstants.WALLET_WITHDRAW_RECORD_KEY, walletWithdrawRecordDTO.getId()));
            try {
                if (recordLock.tryLock(10, 30, TimeUnit.SECONDS)) {
                    try {
                        if(!walletWithdrawRecordDTO.getApproveState().equals(Constants.WALLET_APPROVE_STATE.WAITING)){
                            String msg =  "重复通过";
                            throw new ValidationException(msg);
                        }
            Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
                        WalletDO walletDO = walletService.getOrCreateBySupplierId(s.getId());
                        RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
                        try {
                            if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
                                try {
                                    if (!ObjectUtils.isEmpty(walletDO)) {
            String name = "";
            name = "供应商" + s.getName();
            UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));
@@ -244,6 +258,9 @@
            walletBillRecordDO.setTransferId(transferReqDTO.getId());
            walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
            walletBillRecordDO.create();
                                        walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
                                        walletBillRecordDO.setChangeAmount(BigDecimal.ZERO);
                                        walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount());
            //提现金额
            BigDecimal withdrawAmount = withdrawRecordDO.getAmount();

@@ -262,14 +279,35 @@
                walletBillRecordDO.setTransferDetailId(dr.getId());
                log.info("发起转账");
                transferReqDTO.setDetails(details);
                                            try {
                //发起转账
                paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
                                               // paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
                                            } catch (Exception e) {
                                                throw new ValidationException(e.getMessage());
                                            }
            }

            //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
            walletBillRecordDO.setRemark("账户资金提现中");
                                        walletBillRecordDO.setActualTransferAmount(withdrawAmount);
                                        walletBillRecordDO.setId(UUIDGenerator.getUUID());
            walletBillRecordMapper.insert(walletBillRecordDO);
            //不需要更新结算单了，此时提现的金额和计算单上的金额不一致
                                    }
                                } finally {
                                    lock.unlock();
                                }
                            }
                        } catch (InterruptedException e) {
                            throw new RuntimeException(e);
                        }
                    } finally {
                        recordLock.unlock();
                    }
                }
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }
        }

        if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
@@ -282,6 +320,23 @@
                if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
                    try {
                        if (!ObjectUtils.isEmpty(walletDO)) {
                            // 2.新增一条账单明细
                            WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
                            walletBillRecordDO.setId(UUIDGenerator.getUUID());
                            walletBillRecordDO.setSupplierId(walletDO.getSupplierId());
                            walletBillRecordDO.setWalletId(walletDO.getId());
                            walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
                            // 发起提现
                            walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.fail.name());
                            walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
                            walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
                            walletBillRecordDO.setChangeAmount(withdrawRecordDO.getAmount());
                            walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
                            walletBillRecordDO.create(SecurityUtils.getUserId());
                            walletBillRecordDO.setId(UUIDGenerator.getUUID());
                            // 保存账单明细
                            walletBillRecordService.save(walletBillRecordDO);

                            //提现中金额:审核失败体现中金额扣减
                            walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));
                            //可提现金额:审核失败可提现金额增加