puzhibing
2025-01-14 1205db4e3dc20905a7e52aa05c2670f98cb51a38
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
@@ -95,7 +95,8 @@
                    return R.fail("查询账户余额出错");
                }
                Double useAbleSettAmount = accountBalanceQueryResult.getUseAbleSettAmount();
                if(useAbleSettAmount < withdrawal.getArrivalAmount().doubleValue()){
                //计算代付手续费
                if(useAbleSettAmount < (withdrawal.getArrivalAmount().doubleValue() + 1)){
                    return R.fail("账户可用余额不足,请先补充账户余额");
                }
                //银行卡转账
@@ -133,6 +134,7 @@
            //添加变动明细
            BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
            balanceChangeRecord.setAppUserId(appUser.getId());
            balanceChangeRecord.setVipId(appUser.getVipId());
            balanceChangeRecord.setOrderId(withdrawal.getId());
            balanceChangeRecord.setChangeType(2);
            balanceChangeRecord.setBeforeAmount(balance);
@@ -156,7 +158,7 @@
    @PostMapping("/withdrawalCallback")
    public Object withdrawalCallback(@RequestBody SinglePayCallbackResult singlePayCallbackResult){
        Integer status = singlePayCallbackResult.getStatus();
        if(203 == status){
        if(203 == status || 205 == status){
            String merchantOrderNo = singlePayCallbackResult.getMerchantOrderNo();
            WithdrawalRequests withdrawalRequests = withdrawalRequestsService.getById(merchantOrderNo);
            if(1 == withdrawalRequests.getStatus()){