From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index 6fa0cb8..44414e8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -1,14 +1,17 @@
 package com.ruoyi.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.vo.OrderPageList;
+import com.ruoyi.order.vo.OrderPageListVo;
 import com.ruoyi.order.vo.OrderVO;
 import com.ruoyi.order.model.Order;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author luodangjia
@@ -18,5 +21,13 @@
     /**
      * 查询用户id
      */
-    List<OrderVO> selectOrderListByUserId(Integer status, Long userId);
+    List<OrderVO> selectOrderListByUserId(@Param("status") Integer status, @Param("userId") Long userId);
+    
+    
+    /**
+     * 管理后台获取订单列表数据
+     * @param orderPageList
+     * @return
+     */
+    List<OrderPageListVo> getOrderPageList(@Param("item") OrderPageList orderPageList);
 }

--
Gitblit v1.7.1