From 627135ebfa510dcb3301e2d407c5c110785d968e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 四月 2025 17:28:07 +0800
Subject: [PATCH] 提现
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 1f61d32..7e1eb65 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
@@ -117,14 +117,25 @@
@Override
public List<Order> excelExport(OrderQueryRequest orderQueryRequest) {
- List<String> ids = orderQueryRequest.getIds();
- List<Order> list;
- if (null != ids && !ids.isEmpty()) {
- list = baseMapper.exportByIdList(ids);
- } else {
- list = baseMapper.exportList(orderQueryRequest);
+// List<String> ids = orderQueryRequest.getIds();
+// List<Order> list;
+// if (null != ids && !ids.isEmpty()) {
+// list = baseMapper.exportByIdList(ids);
+// } else {
+// list = baseMapper.exportList(orderQueryRequest);
+// }
+ List<Order> orders = baseMapper.excelExportList(orderQueryRequest);
+ List<ChangeDispatch> list = changeDispatchService.lambdaQuery()
+ .eq(ChangeDispatch::getIsDelete, 0)
+ .orderByDesc(ChangeDispatch::getCreateTime).list();
+ for (Order order : orders) {
+ ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
+ .findFirst().orElse(null);
+ if (null != changeDispatch) {
+ order.setApplyReason(changeDispatch.getApplyReason());
+ }
}
- return list;
+ return orders;
}
@Override
--
Gitblit v1.7.1