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

无关风月

2025-04-22 4010eccfd7a6e0f79041f9cb051c7f9d09bfdedc

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java

@@ -258,7 +258,12 @@
            }

            @Override
            public R<String> call(Integer orderId) {
            public R<String> call(String orderId) {
                return R.fail(cause.getMessage());
            }

            @Override
            public R<String> receiving(String orderId, BigDecimal recycleSubsidy) {
                return R.fail(cause.getMessage());
            }