From df770e2fcc22ba7cd0a89ababdd381e862ffe3ab Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 23 十月 2025 17:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action

---
 framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
index 27f7281..5a19366 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.order.order.service;
 
+import cn.lili.base.Result;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.lmk.domain.vo.OrderCountVO;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
@@ -10,6 +11,7 @@
 import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
 import cn.lili.modules.order.order.entity.vo.OrderSimpleXcxVO;
 import cn.lili.modules.order.order.entity.vo.PaymentLog;
+import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.system.entity.vo.Traces;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -61,6 +63,8 @@
      * @return 绠�鐭鍗曞垎椤�
      */
     IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide);
+
+    IPage<OrderSimpleVO> queryShareMineOrder(OrderSearchParams orderSearchParams,Boolean needHide);
     /**
      * 璁㈠崟鏌ヨ
      *
@@ -117,6 +121,13 @@
      * @return 瀵煎嚭璁㈠崟鍒楄〃
      */
     void queryExportOrder(HttpServletResponse response,OrderSearchParams orderSearchParams) ;
+    /**
+     * 鏌ヨ瀵煎嚭璁㈠崟鍒楄〃
+     *
+     * @param orderSearchParams 鏌ヨ鍙傛暟
+     * @return 瀵煎嚭璁㈠崟鍒楄〃
+     */
+    void queryShareExportOrder(HttpServletResponse response,OrderSearchParams orderSearchParams) ;
 
 
     /**
@@ -352,4 +363,16 @@
     Order updateSellerRemark(String orderSn, String sellerRemark);
 
 
+    /**
+     * 鑾峰緱姣忔棩璁㈠崟缁熻鏁版嵁 璁㈠崟缁熻鎶樼嚎鍥剧敤
+     * @param queryParam
+     * @return
+     */
+    Result getOrderCount(StatisticsQueryParam queryParam);
+
+    Result getOrderTimePeriod(StatisticsQueryParam queryParam);
+
+    Result getPvUv(StatisticsQueryParam queryParam);
+
+    Result gerProductRepurchase(StatisticsQueryParam queryParam);
 }
\ No newline at end of file

--
Gitblit v1.8.0