From 0f9d03ee930d1c2dc62b34dd2c3522cda91f93cf Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期二, 06 六月 2023 14:29:33 +0800 Subject: [PATCH] 基础配置 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 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 a79cfdd..ed87d0e 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 @@ -3,11 +3,11 @@ 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.dto.MgtMemberOrderPageDto; +import com.ruoyi.order.domain.dto.MgtMemberOrderTotalDto; 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.order.domain.vo.*; import com.ruoyi.system.api.domain.dto.MerPageDto; import org.apache.ibatis.annotations.Param; @@ -42,10 +42,33 @@ /** - * + * 分页获取商户订单 * @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); + + /** + * 获取用户订单统计 + * @param mgtMemberOrderTotalDto + * @return + */ + MgtMemberOrderTotalVo getMgtMemberOrderTotal(@Param("param") MgtMemberOrderTotalDto mgtMemberOrderTotalDto); + + /** + * 分页获取用户订单列表 + * @param page + * @param mgtMemberOrderPageDto + * @return + */ + List<MgtMemberOrderPageVo> pageMgtMemberOrder(Page page, @Param("param") MgtMemberOrderPageDto mgtMemberOrderPageDto); } -- Gitblit v1.7.1