From 9e7b5dd397e17fe141cc7630df51699125857756 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 20 六月 2023 18:35:35 +0800
Subject: [PATCH] BUG修复和营销统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
index 86fd0b9..9dcc26e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
@@ -1,14 +1,16 @@
package com.ruoyi.order.service.order;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.dto.*;
+import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
-import com.ruoyi.order.domain.pojo.order.Order;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.system.api.domain.dto.MgtActivityAgeDto;
+import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import java.util.List;
@@ -109,10 +111,117 @@
void createNewOrder(MerNewOrderDto merNewOrderDto);
/**
- *
+ * 分页获取商户订单
* @param merOrderPageDto
* @return
*/
List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);
+ /**
+ * 分页商户端用户收银记录
+ * @param page
+ * @param merMemberNoClearOrderDto
+ * @return
+ */
+ List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+
+ /**
+ * 获取用户订单统计
+ * @param mgtMemberOrderTotalDto
+ * @return
+ */
+ MgtMemberOrderTotalVo getMgtMemberOrderTotal(MgtMemberOrderTotalDto mgtMemberOrderTotalDto);
+
+ /**
+ * 分页获取用户订单列表
+ * @param page
+ * @param mgtMemberOrderPageDto
+ * @return
+ */
+ List<MgtMemberOrderPageVo> pageMgtMemberOrder(Page page, MgtMemberOrderPageDto mgtMemberOrderPageDto);
+
+ /**
+ * @description 分页获取活动订单列表
+ * @author jqs
+ * @date 2023/6/16 10:43
+ * @param page
+ * @param mgtShopOrderPageDto
+ * @return List<MgtActivityOrderPageVo>
+ */
+ List<MgtActivityOrderPageVo> pageMgtActivityOrder(Page page, MgtShopOrderPageDto mgtShopOrderPageDto);
+
+ /**
+ * @description 获取订单统计
+ * @author jqs
+ * @date 2023/6/16 12:51
+ * @param mgtShopOrderPageDto
+ * @return MgtMemberOrderTotalVo
+ */
+ MgtOrderTotal getMgtOrderTotal(MgtShopOrderPageDto mgtShopOrderPageDto);
+
+ /**
+ * @description 分页获取门店订单列表
+ * @author jqs
+ * @date 2023/6/16 14:57
+ * @param page
+ * @param mgtShopOrderPageDto
+ * @return List<MgtShopOrderPageVo>
+ */
+ List<MgtShopOrderPageVo> pageMgtShopOrder(Page page, MgtShopOrderPageDto mgtShopOrderPageDto);
+
+ /**
+ * @description 获取订单详情
+ * @author jqs
+ * @date 2023/6/16 16:49
+ * @param orderId
+ * @return MgtOrderDetailVo
+ */
+ MgtOrderDetailVo getMgtOrderDetail(String orderId);
+
+
+ /**
+ * @description boardOrderTotal
+ * @param
+ * @return MgtBulletinBoardVo
+ * @author jqs34
+ * @date 2023/6/18 17:20
+ */
+ MgtBulletinBoardVo boardOrderTotal();
+
+ /**
+ * @description getTotalOrderTotal
+ * @param mgtBaseShopDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:23
+ */
+ MgtTotalOrderTotalVo getTotalOrderTotal(MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 9:28
+ * @param mgtBaseShopDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 9:57
+ * @param mgtActivityAgeDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 15:50
+ * @param mgtBaseShopDto
+ * @return MgtTotalDataTotalVo
+ */
+ MgtTotalDataTotalVo getTotalDataTotal(MgtBaseShopDto mgtBaseShopDto);
}
--
Gitblit v1.7.1