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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

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

@@ -162,7 +162,7 @@
            }

            @Override
            public R<Page<Order>> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
            public R<Page<Order>> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
                return R.fail(cause.getMessage());
            }

@@ -248,11 +248,26 @@
            }

            @Override
            public R<Boolean> updateArrivalTime(String orderId, Date arriveTime) {
            public R<Boolean> updateArrivalTime(String orderId, String arriveTime) {
                return null;
            }

            @Override
            public R<Boolean> batchUpdateTime(String ids, String time) {
                return R.fail(cause.getMessage());
            }

            @Override
            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());
            }

            @Override
            public R<Boolean> changeOrderState(String orderId, Integer state) {
                return R.fail(cause.getMessage());
            }