From 2cc5f6295aeba326b82deaf5f8bded61b9e1ae16 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期日, 07 五月 2023 18:57:59 +0800 Subject: [PATCH] DEMO初步完成 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 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 d0bcccc..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 @@ -2,9 +2,13 @@ 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; @@ -26,4 +30,30 @@ * @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