From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
index efc2cb8..6a80a15 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -1,7 +1,17 @@
package com.ruoyi.order.mapper.order;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.order.domain.dto.AppUserOrderPageDto;
+import com.ruoyi.order.domain.dto.MerOrderPageDto;
import com.ruoyi.order.domain.pojo.order.Order;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.domain.vo.AppUserOrderPageVo;
+import com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo;
+import com.ruoyi.order.domain.vo.MerOrderPageVo;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +23,37 @@
*/
public interface OrderMapper extends BaseMapper<Order> {
+ /**
+ * 分页获取用户订单
+ * @param page
+ * @param appUserOrderPageDto
+ * @return
+ */
+ List<AppUserOrderPageVo> pageUserOrder(Page page, @Param("param") AppUserOrderPageDto appUserOrderPageDto);
+
+ /**
+ * 收银未结清订单列表
+ * @param page
+ * @param userId
+ * @return
+ */
+ List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("userId") Long userId);
+
+
+
+ /**
+ *
+ * @param merOrderPageDto
+ * @return
+ */
+ List<MerOrderPageVo> pageMerOrder(Page page,@Param("param") MerOrderPageDto merOrderPageDto);
+
+
+ /**
+ * 收银未结清订单列表
+ * @param page
+ * @param userId
+ * @return
+ */
+ List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, @Param("userId") Long userId);
}
--
Gitblit v1.7.1