From a0e041cef9d0cb1c340e5341939901b229a2de01 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 七月 2024 10:56:48 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 6 +++---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java | 16 +++++++++++-----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java
index d728c8d..a28e3fb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java
@@ -19,6 +19,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -52,9 +53,9 @@
*/
public MgtOrderStaticsVO getOverview(MgtOrderStaticsQuery query) {
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- getTimeByTimeType(query, startTime, endTime);
+ List<LocalDateTime> timeByTimeType = getTimeByTimeType(query);
+ LocalDateTime startTime = timeByTimeType.get(0);
+ LocalDateTime endTime = timeByTimeType.get(1);
List<Order> orderList = orderService.getStaticsOrderList(startTime, endTime);
if (orderList.isEmpty()) {
throw new ServiceException("暂无数据");
@@ -147,8 +148,10 @@
return mgtOrderStaticsVO;
}
- private void getTimeByTimeType(MgtOrderStaticsQuery query, LocalDateTime startTime,
- LocalDateTime endTime) {
+ private List<LocalDateTime> getTimeByTimeType(MgtOrderStaticsQuery query) {
+ LocalDateTime startTime;
+ LocalDateTime endTime;
+ List<LocalDateTime> range = new ArrayList<>();
LocalDateTime now = LocalDateTime.now();
if (Objects.equals(TimeTypeEnum.TODAY.getCode(), query.getTimeType())) {
startTime = DateUtils.getDayStart(now);
@@ -169,6 +172,9 @@
startTime = DateUtils.getDayStart(now);
endTime = DateUtils.getDayEnd(now);
}
+ range.add(startTime);
+ range.add(endTime);
+ return range;
}
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index e1faa77..d11ca70 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -111,11 +111,11 @@
FROM t_order o
LEFT JOIN t_order_return_request torr ON o.id = torr.order_id
<where>
- o.order_status IN (1, 2, 3, 4)
- OR (o.order_status = 6 AND torr.audit_status != 2)
<if test="startTime != null and endTime != null">
- AND o.create_time between #{startTime,jdbcType=TIMESTAMP} and #{endTime,jdbcType=TIMESTAMP}
+ o.create_time between #{startTime} and #{endTime}
</if>
+ AND o.order_status IN (1, 2, 3, 4)
+ OR (o.order_status = 6 AND torr.audit_status != 2)
</where>
</select>
--
Gitblit v1.7.1