From d9e75c8c09738b31c375e3b843a3f2d4927f325f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 09:13:29 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 217 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 193 insertions(+), 24 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 c1f0464..bb96a47 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,14 +5,11 @@
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.dto.*;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
@@ -156,6 +153,15 @@
/**
* @description getTotalOrderTotalGoodsType
+ * @param merTotalDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:24
+ */
+ MerOrderTotalVo getMerTotalOrderTotalGoodsType(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description getTotalOrderTotalGoodsType
* @param mgtBaseShopDto
* @return MgtTotalOrderTotalVo
* @author jqs34
@@ -166,7 +172,7 @@
/**
* @description listTotalOrderTotal
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -175,7 +181,7 @@
/**
* @description listTotalOrderTotalGoodsType
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -185,7 +191,7 @@
/**
* @description listTotalOrderTotalGoodsRank
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -194,7 +200,7 @@
/**
* @description listTotalOrderTotalOrderFrom
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -214,7 +220,7 @@
/**
* @description listTotalActivityTotalGoodsType
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -224,7 +230,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -246,7 +252,7 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- List<MgtMapTotalVo> getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+ List<MgtMapIntTotalVo> getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
/**
* @description
@@ -280,9 +286,9 @@
* @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);
/**
@@ -306,7 +312,7 @@
/**
* @description listTotalOrderTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -315,7 +321,7 @@
/**
* @description listTotalOrderTotalGoodsType
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -325,7 +331,7 @@
/**
* @description listTotalOrderTotalGoodsRank
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -334,7 +340,7 @@
/**
* @description listTotalOrderTotalOrderFrom
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -353,7 +359,7 @@
/**
* @description listTotalActivityTotalGoodsType
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -363,7 +369,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -385,12 +391,12 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- List<MgtMapTotalVo> getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto);
+ List<MgtMapIntTotalVo> getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto);
/**
* @description listPlTotalShopActivityRank
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -399,7 +405,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -408,7 +414,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -424,6 +430,14 @@
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
@@ -431,4 +445,159 @@
* @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);
+
+ /**
+ * @description 统计用户活动参与次数
+ * @author jqs
+ * @date 2023/7/13 18:27
+ * @param userId
+ * @param activityId
+ * @return Integer
+ */
+ Integer countUserActivityByActivity(@Param("userId")Long userId, @Param("activityId")String activityId);
+
+
+ /**
+ * @description 员工端活动订单统计
+ * @author jqs
+ * @date 2023/7/17 15:25
+ * @param staffTotalDto
+ * @return StaffActivityOrderTotalVo
+ */
+ StaffActivityOrderTotalVo getStaffActivityOrderTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 员工端活动统计
+ * @author jqs
+ * @date 2023/7/17 15:51
+ * @param staffTotalDto
+ * @return StaffActivityTotalVo
+ */
+ StaffActivityTotalVo getStaffActivityTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+
+ /**
+ * @description 获取各年龄层统计
+ * @author jqs
+ * @date 2023/7/4 10:27
+ * @param userIdList
+ * @return MgtMapTotalPlusVo
+ */
+ MgtMapTotalPlusVo listStaffActivityOrderDistributionTotal(@Param("userIdList")List<Long> userIdList,@Param("shopId")Long shopId,@Param("activityId")String activityId);
+
+
+ /**
+ * @description 员工端活动统计销售占比
+ * @author jqs
+ * @date 2023/7/17 17:05
+ * @param staffTotalDto
+ * @return List<MgtMapTotalPlusVo>
+ */
+ List<MgtMapTotalPlusVo> listStaffOrderTotalGoodsType(@Param("param")StaffTotalDto staffTotalDto);
+
+
+ /**
+ * @description 员工端获取活动获客人数
+ * @author jqs
+ * @date 2023/7/17 18:44
+ * @param staffTotalDto
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapIntTotalVo> getStaffActivityGetMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 员工端获取活动获客人数
+ * @author jqs
+ * @date 2023/7/17 18:44
+ * @param staffTotalDto
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapIntTotalVo> getStaffActivityMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 获取用户商品购买数量
+ * @author jqs
+ * @date 2023/7/23 18:17
+ * @param userId
+ * @param goodsId
+ * @return Integer
+ */
+ Integer countUserBuyGoodsNum(@Param("userId")Long userId, @Param("goodsId")String goodsId);
}
--
Gitblit v1.7.1