From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 80 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 31 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 5892db8..fcad0f5 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,15 +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.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.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;
/**
@@ -164,7 +163,7 @@
/**
* @description listTotalOrderTotal
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -173,7 +172,7 @@
/**
* @description listTotalOrderTotalGoodsType
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -183,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);
/**
@@ -212,7 +211,7 @@
/**
* @description listTotalActivityTotalGoodsType
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -222,7 +221,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBaseShopDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -244,7 +243,7 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtTotalActivityTotalVo getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+ List<MgtMapIntTotalVo> getTotalActivityAgeRank(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
/**
* @description
@@ -278,9 +277,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);
/**
@@ -304,7 +303,7 @@
/**
* @description listTotalOrderTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -313,7 +312,7 @@
/**
* @description listTotalOrderTotalGoodsType
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -323,20 +322,20 @@
/**
* @description listTotalOrderTotalGoodsRank
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapTotalPlusVo> listPlTotalOrderTotalGoodsRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> listPlTotalOrderTotalGoodsRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description listTotalOrderTotalOrderFrom
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapTotalPlusVo> listPlTotalOrderTotalOrderFrom(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> listPlTotalOrderTotalOrderFrom(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description getTotalActivityTotal
@@ -351,7 +350,7 @@
/**
* @description listTotalActivityTotalGoodsType
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -361,7 +360,7 @@
/**
* @description listTotalActivityTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
@@ -383,34 +382,34 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtPlTotalActivityTotalVo 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
*/
- List<MgtMapTotalPlusVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description listTotalActivityTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapTotalPlusVo> listPlTotalShopActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> listPlTotalShopActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description listTotalActivityTotal
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapTotalPlusVo> listPlTotalActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> listPlTotalActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description
@@ -420,4 +419,23 @@
* @return MerHomeShopTotalVo
*/
MerHomeShopTotalVo getMerHomeShopTotalVo(Long shopId);
+
+ /**
+ * @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);
}
--
Gitblit v1.7.1