Merge remote-tracking branch 'origin/2.3' into 2.3

longz

2026-09-29 0ca3a3922d2d25df52682b2290be15135cce100e

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserWhitelistFallbackFactory.java

@@ -9,6 +9,7 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -31,6 +32,21 @@
            public R<List<TAppUserWhitelist>> listByCompany(Integer companyId) {
                return R.fail("白名单用户服务调用失败:" + throwable.getMessage());
            }

            @Override
            public R<BigDecimal> lockBalance(Long whitelistId, BigDecimal amount) {
                return R.fail("白名单用户服务调用失败:" + throwable.getMessage());
            }

            @Override
            public R<BigDecimal> settleBalance(Long whitelistId, BigDecimal lockedAmount, BigDecimal actualAmount) {
                return R.fail("白名单用户服务调用失败:" + throwable.getMessage());
            }

            @Override
            public R<BigDecimal> unlockBalance(Long whitelistId, BigDecimal amount) {
                return R.fail("白名单用户服务调用失败:" + throwable.getMessage());
            }
        };
    }
}