From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 95 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 9 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..0c0d230 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,14 +1,10 @@
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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.order.domain.dto.*;
+import com.ruoyi.order.domain.pojo.order.Order;
+import com.ruoyi.order.domain.vo.*;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -42,10 +38,91 @@
/**
- *
+ * 分页获取商户订单
* @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);
+
+
+ /**
+ * @description 分页获取活动订单列表
+ * @author jqs
+ * @date 2023/6/16 10:43
+ * @param page
+ * @param mgtShopOrderPageDto
+ * @return List<MgtActivityOrderPageVo>
+ */
+ List<MgtActivityOrderPageVo> pageMgtActivityOrder(Page page, @Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
+
+ /**
+ * @description 统计订单总数
+ * @author jqs
+ * @date 2023/6/16 13:39
+ * @param
+ * @return MgtOrderTotal
+ */
+ MgtOrderTotal totalOrderFirst();
+
+ /**
+ * @description 统计门店订单总数
+ * @author jqs
+ * @date 2023/6/16 13:53
+ * @param mgtShopOrderPageDto
+ * @return MgtOrderTotal
+ */
+ MgtOrderTotal totalOrderSecond(@Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
+
+ /**
+ * @description 统计活动订单总数
+ * @author jqs
+ * @date 2023/6/16 13:53
+ * @param mgtShopOrderPageDto
+ * @return MgtOrderTotal
+ */
+ MgtOrderTotal totalOrderThird(@Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
+
+ /**
+ * @description 统计订单总数
+ * @author jqs
+ * @date 2023/6/16 13:53
+ * @param mgtShopOrderPageDto
+ * @return MgtOrderTotal
+ */
+ MgtOrderTotal totalOrder(@Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
+
+
+ /**
+ * @description 分页获取门店订单列表
+ * @author jqs
+ * @date 2023/6/16 14:57
+ * @param page
+ * @param mgtShopOrderPageDto
+ * @return List<MgtShopOrderPageVo>
+ */
+ List<MgtShopOrderPageVo> pageMgtShopOrder(Page page, @Param("param")MgtShopOrderPageDto mgtShopOrderPageDto);
}
--
Gitblit v1.7.1