From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
index ae5925d..09a7d53 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
@@ -8,14 +8,14 @@
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.TActivityStatisticslVO;
import com.ruoyi.order.api.vo.TActivityVO;
-import com.ruoyi.order.dto.GetMyShoppingOrderList;
-import com.ruoyi.order.dto.GetNoInvoicedOrder;
-import com.ruoyi.order.dto.MyShoppingOrderInfo;
-import com.ruoyi.order.dto.MyShoppingOrderList;
+import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -35,7 +35,7 @@
* @param query
* @return
*/
- List<MyShoppingOrderList> getMyShoppingOrderList(GetMyShoppingOrderList query);
+ Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query);
/**
@@ -77,4 +77,9 @@
PageInfo<TShoppingOrder> pageList(ShoppingOrderQuery query);
+ List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);
+
+ BigDecimal getSumAmount(LocalDate sixBefore);
+
+ List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto);
}
--
Gitblit v1.7.1