From 08f58a6d5a2038117a1f215772f095a6e267ad9b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 五月 2025 11:05:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index a89e6fa..d769423 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -183,12 +183,18 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo
+ , @RequestParam(required = false) Integer settle) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("status", 1);
+ if (!Cools.isEmpty(settle)) {
+ wrapper.eq("settle", settle);
+ }else {
+ wrapper.le("settle", 2);
+ }
+ wrapper.eq("status", 1);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
--
Gitblit v1.9.1