add:钱包功能调整

cloudroam

2024-11-07 37f3d16b75bb388d665c93ff0ed3945093df42bc

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

@@ -150,6 +150,8 @@
                    walletBillRecordDO.setChangeAmount(dto.getAmount());
                    walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
                    walletBillRecordDO.create(SecurityUtils.getUserId());
                    walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
                    walletBillRecordDO.setRemark("提现中");

                    // 保存账单明细
                    walletBillRecordService.save(walletBillRecordDO);
@@ -252,17 +254,21 @@
                                        transferReqDTO.setRemarks(remarks);

                                        //保存账单信息
                                        WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
                                        walletBillRecordDO.setSupplierId(s.getId());
                                        walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
                                        walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.success.name());
                                        walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
                                        walletBillRecordDO.setTransferId(transferReqDTO.getId());
                                        walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
                                        walletBillRecordDO.create();
                                        walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
                                        walletBillRecordDO.setChangeAmount(BigDecimal.ZERO);
                                        walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount());
//                                        WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
//                                        walletBillRecordDO.setSupplierId(s.getId());
//                                        walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
//                                        walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.success.name());
//                                        walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
//                                        walletBillRecordDO.setTransferId(transferReqDTO.getId());
//                                        walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
//                                        walletBillRecordDO.create();
//                                        walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
//                                        walletBillRecordDO.setChangeAmount(BigDecimal.ZERO);
//                                        walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount());
                                        WalletBillRecordDO walletBillRecordDO = walletBillRecordService.getBillRecordByWithdrawRecordId(withdrawRecordDO.getId());
                                        if(ObjectUtils.isEmpty(walletBillRecordDO)){
                                            throw new ValidationException("提现没有对应的账单信息");
                                        }
                                        //提现金额
                                        BigDecimal withdrawAmount = withdrawRecordDO.getAmount();

@@ -283,17 +289,18 @@
                                            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.setRemark("微信商户转账中");
                                        walletBillRecordDO.setActualTransferAmount(withdrawAmount);
                                        walletBillRecordDO.setId(UUIDGenerator.getUUID());
                                        walletBillRecordMapper.insert(walletBillRecordDO);
                                        walletBillRecordService.updateById(walletBillRecordDO);
//                                        walletBillRecordMapper.insert(walletBillRecordDO);
                                        //不需要更新结算单了，此时提现的金额和计算单上的金额不一致
                                    }
                                } finally {
@@ -336,6 +343,7 @@
                            walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
                            walletBillRecordDO.create(SecurityUtils.getUserId());
                            walletBillRecordDO.setId(UUIDGenerator.getUUID());
                            walletBillRecordDO.setRemark("平台审核拒绝，余额返还钱包");
                            // 保存账单明细
                            walletBillRecordService.save(walletBillRecordDO);