From 24dc501ed2eca9ffa890784c9028b5ac954c2faa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 11:41:37 +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 | 8 +++++++-
1 files changed, 7 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 9357c4f..16d9c17 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
@@ -12,6 +12,7 @@
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -161,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());
}
@@ -247,6 +248,11 @@
}
@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