Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-26 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063

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

@@ -181,6 +181,13 @@

    @Override
    public Page<WalletWithdrawRecordVO> queryPage(QueryWalletWithdrawDTO queryWalletDTO, Page page) {
        try {
            if (!StringUtils.isEmpty(queryWalletDTO.getSupplierId())) {
                Long supplierId = Long.parseLong(queryWalletDTO.getSupplierId());
            }
        } catch (Exception e) {
            throw new ValidationException("供应商ID格式不正确");
        }
        List<WalletWithdrawRecordVO> list = walletWithdrawRecordMapper.queryPage(queryWalletDTO, page);
        page.setRecords(list);
        return page;
@@ -269,6 +276,7 @@
                                        if(ObjectUtils.isEmpty(walletBillRecordDO)){
                                            throw new ValidationException("提现没有对应的账单信息");
                                        }
                                        walletBillRecordDO.setTransferId(transferReqDTO.getId());
                                        //提现金额
                                        BigDecimal withdrawAmount = withdrawRecordDO.getAmount();

@@ -289,7 +297,7 @@
                                            transferReqDTO.setDetails(details);
                                            try {
                                                //发起转账
                                                paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
                                                 paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
                                            } catch (Exception e) {
                                                throw new ValidationException(e.getMessage());
                                            }
@@ -298,9 +306,9 @@
                                        //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
                                        walletBillRecordDO.setRemark("微信商户转账中");
                                        walletBillRecordDO.setActualTransferAmount(withdrawAmount);
                                        walletBillRecordDO.setId(UUIDGenerator.getUUID());
                                        walletBillRecordService.updateById(walletBillRecordDO);
//                                        walletBillRecordMapper.insert(walletBillRecordDO);
                                        walletBillRecordDO.setApproveBy(SecurityUtils.getUserId());
                                        walletBillRecordDO.setApproveTime(LocalDateTime.now());
                                        walletBillRecordMapper.updateById(walletBillRecordDO);
                                        //不需要更新结算单了，此时提现的金额和计算单上的金额不一致
                                    }
                                } finally {
@@ -344,6 +352,8 @@
                            walletBillRecordDO.create(SecurityUtils.getUserId());
                            walletBillRecordDO.setId(UUIDGenerator.getUUID());
                            walletBillRecordDO.setRemark("平台审核拒绝，余额返还钱包");
                            walletBillRecordDO.setApproveBy("sys");
                            walletBillRecordDO.setApproveTime(LocalDateTime.now());
                            // 保存账单明细
                            walletBillRecordService.save(walletBillRecordDO);