From ecf1ec75a444ac96398a0cd68106dc2dea01ea33 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 20:34:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java |   76 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 3eae05f..69f5465 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -3,13 +3,16 @@
 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;
+import com.ruoyi.order.api.request.OrderCountDataRequest;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +30,11 @@
             }
 
             @Override
+            public R<Boolean> edit(OrderRequest orderRequest) {
+                return R.fail(cause.getMessage());
+            }
+
+            @Override
             public R<Order> detailByExchangeId(String id) {
                 return R.fail(cause.getMessage());
             }
@@ -34,6 +42,11 @@
             @Override
             public R<Order> detail(String id) {
                 return R.fail(cause.getMessage());
+            }
+
+            @Override
+            public R msgCount(String id) {
+                return null;
             }
 
             @Override
@@ -47,7 +60,7 @@
             }
 
             @Override
-            public R<Page<OrderCountVO>> orderCount(String name, String phone, Integer pageNum, Integer pageSize) {
+            public R<Page<OrderCountVO>> orderCount(OrderCountDataRequest request) {
                 return R.fail(cause.getMessage());
             }
 
@@ -67,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());
             }
@@ -74,6 +91,28 @@
             @Override
             public R<Boolean> updateState(String orderId, Integer state) {
                 return R.fail(cause.getMessage());
+            }
+
+            @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
@@ -92,7 +131,23 @@
             }
 
             @Override
-            public R<IPage<Order>> orderList(Integer userId, Integer pageNum, Integer pageSize) {
+            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,List<String> siteIds) {
+                return R.fail(cause.getMessage());
+            }
+
+            @Override
+            public R<Page<Order>> workOrderList(Integer workId, Integer pageNum, Integer pageSize,String [] siteIds) {
                 return R.fail(cause.getMessage());
             }
 
@@ -102,7 +157,7 @@
             }
 
             @Override
-            public R<BigDecimal> tradeMoney(List<String> cityList, String type) {
+            public R<BigDecimal> tradeMoney(MoneyQueryRequest moneyQueryRequest) {
                 return R.fail(cause.getMessage());
             }
 
@@ -178,11 +233,26 @@
             }
 
             @Override
+            public R<Boolean> orderByUserId(Integer userId) {
+                return R.fail(cause.getMessage());
+            }
+
+            @Override
             public R<Boolean> supplementAllowance(String orderId, String prizeName) {
                 return R.fail(cause.getMessage());
             }
 
             @Override
+            public R<String> oldData(Integer index, Integer pageNum, Integer pageSize) {
+                return R.fail(cause.getMessage());
+            }
+
+            @Override
+            public R<Boolean> updateArrivalTime(String orderId, String arriveTime) {
+                return null;
+            }
+
+            @Override
             public R<Boolean> changeOrderState(String orderId, Integer state) {
                 return R.fail(cause.getMessage());
             }

--
Gitblit v1.7.1