Spaces:
Sleeping
Sleeping
trae-bot commited on
Commit ·
cbed33a
1
Parent(s): 426f2a4
fix: date range logic and reply parent id logic
Browse files
backend/src/admin/admin.service.ts
CHANGED
|
@@ -47,8 +47,8 @@ export class AdminService {
|
|
| 47 |
|
| 48 |
if (endDate) {
|
| 49 |
const end = new Date(endDate);
|
| 50 |
-
end.
|
| 51 |
-
query.andWhere('order.createdAt < :endDate', { endDate: end });
|
| 52 |
}
|
| 53 |
|
| 54 |
const results = await query.groupBy('order.orderType').getRawMany();
|
|
@@ -89,8 +89,8 @@ export class AdminService {
|
|
| 89 |
|
| 90 |
if (endDate) {
|
| 91 |
const end = new Date(endDate);
|
| 92 |
-
end.
|
| 93 |
-
query.andWhere('order.createdAt < :endDate', { endDate: end });
|
| 94 |
}
|
| 95 |
|
| 96 |
return query.orderBy('order.createdAt', 'DESC').getMany();
|
|
|
|
| 47 |
|
| 48 |
if (endDate) {
|
| 49 |
const end = new Date(endDate);
|
| 50 |
+
end.setHours(23, 59, 59, 999);
|
| 51 |
+
query.andWhere('order.createdAt <= :endDate', { endDate: end });
|
| 52 |
}
|
| 53 |
|
| 54 |
const results = await query.groupBy('order.orderType').getRawMany();
|
|
|
|
| 89 |
|
| 90 |
if (endDate) {
|
| 91 |
const end = new Date(endDate);
|
| 92 |
+
end.setHours(23, 59, 59, 999);
|
| 93 |
+
query.andWhere('order.createdAt <= :endDate', { endDate: end });
|
| 94 |
}
|
| 95 |
|
| 96 |
return query.orderBy('order.createdAt', 'DESC').getMany();
|