From efe79e640c4598f52c2d1032fcead000edf8049e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 10:29:53 +0800
Subject: [PATCH] 统计bug和验证优化
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 218 insertions(+), 9 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 282fec9..fd0480c 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,17 +1,15 @@
package com.ruoyi.order.service.order;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
-import com.ruoyi.order.domain.dto.AppPlaceOrderDto;
-import com.ruoyi.order.domain.dto.AppSureOrderDto;
-import com.ruoyi.order.domain.dto.AppUserOrderPageDto;
-import com.ruoyi.order.domain.pojo.order.Order;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.domain.vo.AppPlaceOrderVo;
-import com.ruoyi.order.domain.vo.AppSureOrderVo;
-import com.ruoyi.order.domain.vo.AppUserOrderGetVo;
-import com.ruoyi.order.domain.vo.AppUserOrderPageVo;
+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.*;
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 com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
import java.util.List;
@@ -68,4 +66,215 @@
* @return
*/
AppOrderTotalVo getAppOrderTotal(Long userId);
+
+ /**
+ * 获取B端首页统计
+ * @param merHomeShopTotalVo
+ * @return
+ */
+ MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo);
+
+ /**
+ * 获取核销订单
+ * @param orderId
+ * @return
+ */
+ MerVerifyOrderVo verifyOrder(String orderId);
+
+ /**
+ * 确认核销订单
+ * @param merVerifyOrderDto
+ * @return
+ */
+ MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto);
+
+ /**
+ * 收银未结清订单列表
+ * @param page
+ * @param merMemberNoClearOrderDto
+ * @return
+ */
+ List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+
+
+ /**
+ * 结清订单
+ * @param merCloseOrderDto
+ */
+ void merCloseOrder(MerCloseOrderDto merCloseOrderDto);
+
+ /**
+ * 创建新订单
+ * @param merNewOrderDto
+ */
+ 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 获取商户订单统计
+ * @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);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/21 15:27
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ */
+ List<MgtMapTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取平台商户数据统计
+ * @param mgtBasePlatformDto
+ * @return List<MgtTotalDataTotalVo>
+ * @author jqs34
+ * @date 2023/6/23 14:01
+ */
+ List<MgtTotalDataTotalVo> getPlTotalDataTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取平台商户订单统计
+ * @param mgtBasePlatformDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:23
+ */
+ MgtTotalOrderTotalVo getPlTotalOrderTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取商户活动统计
+ * @author jqs
+ * @date 2023/6/20 9:28
+ * @param mgtBasePlatformDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取商户活动年龄分布
+ * @author jqs
+ * @date 2023/6/20 9:57
+ * @param mgtPLActivityAgeDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto);
+
+ /**
+ * @description 获取优惠券核销信息
+ * @author jqs
+ * @date 2023/6/27 11:10
+ * @param verifyCode
+ * @return MerVerifyCouponVo
+ */
+ MerVerifyCouponVo verifyCoupon(String verifyCode);
}
--
Gitblit v1.7.1