From 90ab70ee2e1adc5f6f2cf3cac38df14b61568ba1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 11 八月 2024 22:54:13 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 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 59e4796..5cda282 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GaoDeMapUtil;
import com.ruoyi.common.core.vo.AddressDto;
+import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.entity.ChangeDispatch;
import com.ruoyi.order.entity.Order;
@@ -100,12 +101,10 @@
orderNumber = list.stream().filter(order -> order.getNumber() != null)
.mapToInt(OrderQueryVO::getNumber).sum();
fakeNumber = list.stream().filter(order -> order.getFakeCount() != null)
- .mapToInt(OrderQueryVO::getNumber).sum();
+ .mapToInt(OrderQueryVO::getFakeCount).sum();
}
- return new
-
- OrderResultVO(totalMoney, orderNumber, list,fakeNumber);
+ return new OrderResultVO(totalMoney, orderNumber, list,fakeNumber);
}
@@ -360,6 +359,11 @@
return String.valueOf(order.getId());
}
+ @Override
+ public List<PaperInVo> papercout(String workId,String date) {
+ return this.baseMapper.papercout(workId,date);
+ }
+
/**
* 根据当前月份获取当前季度的开始月份
*/
--
Gitblit v1.7.1