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

@@ -12,6 +12,7 @@
import org.springframework.stereotype.Component;

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

/**
@@ -41,6 +42,11 @@
            @Override
            public R<Order> detail(String id) {
                return R.fail(cause.getMessage());
            }

            @Override
            public R msgCount(String id) {
                return null;
            }

            @Override
@@ -74,6 +80,10 @@
            }

            @Override
            public R<List<String>> queryPage1(OrderQueryRequest orderQueryRequest) {
                return R.fail(cause.getMessage());            }

            @Override
            public R<OrderPageCountVO> orderPageCount(OrderQueryRequest orderQueryRequest) {
                return R.fail(cause.getMessage());
            }
@@ -98,6 +108,11 @@
            @Override
            public R<List<Integer>> queryIdsBycode(List<String> cityList) {
                return R.fail(cause.getMessage());
            }

            @Override
            public R<List<Integer>> queryIdsBycodeAndSite(List<String> cityList, List<String> siteIds) {
                return null;
            }

            @Override
@@ -127,12 +142,12 @@
            }

            @Override
            public R<Page<Order>> orderList1(Integer userId, List<String> cityList, Integer pageNum, Integer pageSize) {
            public R<Page<Order>> orderList1(Integer userId, List<String> cityList, Integer pageNum, Integer pageSize,List<String> siteIds) {
                return R.fail(cause.getMessage());
            }

            @Override
            public R<Page<Order>> workOrderList(Integer workId, Integer pageNum, Integer pageSize) {
            public R<Page<Order>> workOrderList(Integer workId, Integer pageNum, Integer pageSize,String [] siteIds) {
                return R.fail(cause.getMessage());
            }

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

@@ -233,6 +248,26 @@
            }

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