From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index ce69e8f..5d4d8a8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -6,9 +6,11 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.vo.*;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -34,6 +36,13 @@
* @return
*/
PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+
+ /**
+ * 获取导出订单列表数据
+ */
+ List<OrderExport> getOrderExportList(OrderPageList orderPageList);
+
+
/**
* 小程序取消订单
@@ -116,5 +125,16 @@
/**
* 导入物流信息
*/
- void importExpress(MultipartFile file);
+ void importExpress(String url);
+
+ Integer getShopSaleNumByShopIds(List<Integer> shopIds, Integer type);
+
+
+ /**
+ * 查询给定用户在给定门店核销的订单
+ * @param shopId
+ * @param appUserId
+ * @return
+ */
+ List<Order> getOrderByAppUserIdsAndWriteOffShop(@RequestParam("shopId") Integer shopId, @RequestParam("appUserId") Set<Long> appUserId);
}
--
Gitblit v1.7.1