From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 69f5465..56b9e4d 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
@@ -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());
}
@@ -253,6 +253,26 @@
}
@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<List<Order>> getTodayOrderData() {
+ return R.fail(cause.getMessage());
+ }
+
+ @Override
public R<Boolean> changeOrderState(String orderId, Integer state) {
return R.fail(cause.getMessage());
}
--
Gitblit v1.7.1