From f2f07f9c707dc4793c42c90c4039b41a59c3d0f2 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 26 六月 2023 19:51:23 +0800
Subject: [PATCH] 商户端和管理台联调bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 390 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 381 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..5892db8 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,17 @@
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 com.ruoyi.system.api.domain.dto.MgtActivityAgeDto;
+import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
+import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
+import com.ruoyi.system.api.domain.dto.MgtPlActivityAgeDto;
+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 org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -42,10 +45,379 @@
/**
- *
+ * 分页获取商户订单
* @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);
+
+
+ /**
+ * @description boardOrderTotal
+ * @param
+ * @return MgtBulletinBoardVo
+ * @author jqs34
+ * @date 2023/6/18 17:20
+ */
+ MgtBulletinBoardVo boardOrderTotal();
+
+ /**
+ * @description getTotalOrderTotalOrderFrom
+ * @param mgtBaseShopDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MgtTotalOrderTotalVo getTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description getTotalOrderTotalGoodsType
+ * @param mgtBaseShopDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MgtTotalOrderTotalVo getTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description listTotalOrderTotal
+ * @param mgtBaseShopDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listTotalOrderTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description listTotalOrderTotalGoodsType
+ * @param mgtBaseShopDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description listTotalOrderTotalGoodsRank
+ * @param mgtBaseShopDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description listTotalOrderTotalOrderFrom
+ * @param mgtBaseShopDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description getTotalActivityTotal
+ * @author jqs
+ * @date 2023/6/20 9:28
+ * @param mgtBaseShopDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtTotalActivityTotalVo getTotalActivityTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description listTotalActivityTotalGoodsType
+ * @param mgtBaseShopDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listTotalActivityTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBaseShopDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listTotalActivityTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 11:37
+ * @param mgtActivityAgeDto
+ * @return List<Long>
+ */
+ List<Long> getUserIdAgeRank(@Param("param") MgtActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 9:57
+ * @param mgtActivityAgeDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtTotalActivityTotalVo getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 15:50
+ * @param mgtBaseShopDto
+ * @return MgtTotalDataTotalVo
+ */
+ MgtTotalDataTotalVo getTotalDataTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 18:16
+ * @param
+ * @return Integer
+ */
+ Integer getReorderPerson(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 18:16
+ * @param
+ * @return Integer
+ */
+ Integer getReturnedPerson(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/21 15:27
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ */
+ List<MgtMapTotalVo> listMemberGoodsRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description getTotalOrderTotalOrderFrom
+ * @param mgtBasePlatformDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MgtTotalOrderTotalVo getPlTotalOrderTotalOrderFrom(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description getTotalOrderTotalGoodsType
+ * @param mgtBasePlatformDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MgtTotalOrderTotalVo getPlTotalOrderTotalGoodsType(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalOrderTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalOrderTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalOrderTotalGoodsType
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalOrderTotalGoodsType(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description listTotalOrderTotalGoodsRank
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalOrderTotalGoodsRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalOrderTotalOrderFrom
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalOrderTotalOrderFrom(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description getTotalActivityTotal
+ * @author jqs
+ * @date 2023/6/20 9:28
+ * @param mgtBasePlatformDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description listTotalActivityTotalGoodsType
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalActivityTotalGoodsType(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalActivityTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 11:37
+ * @param mgtActivityAgeDto
+ * @return List<Long>
+ */
+ List<Long> getPlUserIdAgeRank(@Param("param") MgtPlActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 9:57
+ * @param mgtActivityAgeDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description listPlTotalShopActivityRank
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalShopActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/25 17:28
+ * @param shopId
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getMerHomeShopTotalVo(Long shopId);
}
--
Gitblit v1.7.1