From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 7e1eb65..514d88e 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -180,9 +180,10 @@
Integer completed = order.getCompleted();
Integer canceled = order.getCanceled();
Integer reInvestment = order.getReInvestment();
- int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment;
+ Integer pending = order.getPending();
+ int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment + pending;
return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
- toBeCompleted, completed, canceled, reInvestment);
+ toBeCompleted, completed, canceled, reInvestment,pending);
}
@@ -220,8 +221,9 @@
}
@Override
- public Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
- return baseMapper.orderListWorker(userId, state, Page.of(pageNum, pageSize));
+ public Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
+ Page<Order> orderPage = baseMapper.orderListWorker(userId, state, searchValues, Page.of(pageNum, pageSize));
+ return baseMapper.orderListWorker(userId, state,searchValues, Page.of(pageNum, pageSize));
}
@Override
--
Gitblit v1.7.1