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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.api.entity.*;
import com.ruoyi.order.api.feignClient.OrderClient;
@@ -11,6 +12,7 @@
import org.springframework.stereotype.Component;

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

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

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

            @Override
@@ -73,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());
            }
@@ -83,8 +94,25 @@
            }

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

            @Override
            public R<List<PaperInVo>> papercount(String workId, String date) {
                return null;
            }



            @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
@@ -103,17 +131,23 @@
            }

            @Override
            public R<List<Order>> workday(Integer workId) {
                return null;
            }


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

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

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

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