From bdf04af3958fb7a61f3180aa1efb795ba8ac00d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 08 九月 2025 15:28:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 616e2c3..9b8efa7 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,6 +1,7 @@
 package cn.lili.modules.order.order.service;
 
 import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.domain.vo.OrderCountVO;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -45,6 +46,13 @@
      */
     Order getBySn(String orderSn);
 
+    /**
+     * 缁熻鐢ㄦ埛鐨勬�婚噾棰濅互鍙婅鍗曞凡瀹屾垚鏁�
+     *
+     * @param id 浼氬憳id
+     * @return
+     */
+    OrderCountVO countByIdOrder(String id);
 
     /**
      * 璁㈠崟鏌ヨ
@@ -52,7 +60,7 @@
      * @param orderSearchParams 鏌ヨ鍙傛暟
      * @return 绠�鐭鍗曞垎椤�
      */
-    IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams);
+    IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide);
     /**
      * 璁㈠崟鏌ヨ
      *
@@ -338,4 +346,6 @@
      * @return 璁㈠崟
      */
     Order updateSellerRemark(String orderSn, String sellerRemark);
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0