From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 08 七月 2023 18:37:12 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 251 insertions(+), 15 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 d21cfb1..265845d 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
@@ -5,13 +5,14 @@
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.*;
+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 com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -162,7 +163,7 @@
/**
* @description listTotalOrderTotal
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -171,7 +172,7 @@
/**
* @description listTotalOrderTotalGoodsType
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -181,20 +182,20 @@
/**
* @description listTotalOrderTotalGoodsRank
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ List<MgtMapBigTotalVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
* @description listTotalOrderTotalOrderFrom
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapTotalPlusVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ List<MgtMapBigTotalVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
@@ -210,7 +211,7 @@
/**
* @description listTotalActivityTotalGoodsType
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -220,7 +221,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -242,7 +243,7 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtTotalActivityTotalVo getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+ List<MgtMapIntTotalVo> getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
/**
* @description
@@ -276,7 +277,242 @@
* @author jqs
* @date 2023/6/21 15:27
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
*/
- List<MgtMapTotalVo> listMemberGoodsRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> 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<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalOrderTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalOrderTotalGoodsType
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalOrderTotalGoodsType(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description listTotalOrderTotalGoodsRank
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listPlTotalOrderTotalGoodsRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalOrderTotalOrderFrom
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> 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<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listPlTotalActivityTotalGoodsType(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @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
+ */
+ List<MgtMapIntTotalVo> getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description listPlTotalShopActivityRank
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listPlTotalShopActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description listTotalActivityTotal
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listPlTotalActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/25 17:28
+ * @param shopId
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getMerHomeShopTotalVo(Long shopId);
+
+ /**
+ * @description
+ * @author cheny
+ * @param shopIds
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getMerHomeShopsTotalVo(List<Long> shopIds);
+
+ /**
+ * @description 统计商户营业额
+ * @author jqs
+ * @date 2023/6/27 19:13
+ * @param mgtBaseShopDto
+ * @return BigDecimal
+ */
+ BigDecimal shopSalesTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description 获取用户未支付金额
+ * @author jqs
+ * @date 2023/6/29 18:00
+ * @param merBaseDto
+ * @return BigDecimal
+ */
+ BigDecimal getMemberUnpaidOrder(@Param("param")MerBaseDto merBaseDto);
+
+
+ /**
+ * @description getTotalOrderTotalOrderFrom
+ * @param merTotalDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MerOrderTotalVo getMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+
+ /**
+ * @description 获取各年龄层统计
+ * @author jqs
+ * @date 2023/7/4 10:27
+ * @param userIdList
+ * @return MgtMapTotalPlusVo
+ */
+ MgtMapTotalPlusVo listMerOrderDistributionTotal(@Param("userIdList")List<Long> userIdList);
+
+ /**
+ * @description 商户获取销售占比统计
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapTotalPlusVo> listMerOrderTotalGoodsType(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户获取销售排名
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listMerOrderTotalGoodsRank(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description listTotalOrderTotalOrderFrom
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ * @author jqs34
+ * @date 2023/6/19 22:48
+ */
+ List<MgtMapBigTotalVo> listMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param shopId
+ * @return MerTotalOrderVo
+ */
+ MerTotalOrderVo totalMerOrder(@Param("shopId")Long shopId);
+
+
+ /**
+ * @description 平台获取商户订单记录
+ * @author jqs
+ * @date 2023/7/5 20:17
+ * @param page
+ * @param mgtShopAllOrderPageDto
+ * @return List<MgtShopAllOrderPageVo>
+ */
+ List<MgtShopAllOrderPageVo> pageMgtShopAllOrder(Page page, @Param("param")MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
+
+
}
--
Gitblit v1.7.1