From 1ffb6c7910cfb4d55b4c169142b67ea872fcf614 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期二, 27 六月 2023 19:55:50 +0800 Subject: [PATCH] BUG联调 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 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..a7d9589 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 @@ -11,9 +11,11 @@ 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.MgtMapBigTotalVo; import com.ruoyi.system.api.domain.vo.MgtMapTotalVo; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -187,7 +189,7 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto); + List<MgtMapBigTotalVo> listTotalOrderTotalGoodsRank(@Param("param") MgtBaseShopDto mgtBaseShopDto); /** * @description listTotalOrderTotalOrderFrom @@ -196,7 +198,7 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto); + List<MgtMapBigTotalVo> listTotalOrderTotalOrderFrom(@Param("param") MgtBaseShopDto mgtBaseShopDto); /** @@ -327,7 +329,7 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listPlTotalOrderTotalGoodsRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); + List<MgtMapBigTotalVo> listPlTotalOrderTotalGoodsRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); /** * @description listTotalOrderTotalOrderFrom @@ -336,7 +338,7 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listPlTotalOrderTotalOrderFrom(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); + List<MgtMapBigTotalVo> listPlTotalOrderTotalOrderFrom(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); /** * @description getTotalActivityTotal @@ -383,7 +385,7 @@ * @param mgtActivityAgeDto * @return MgtTotalActivityTotalVo */ - MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto); + List<MgtMapTotalPlusVo> getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto); /** * @description listPlTotalShopActivityRank @@ -420,4 +422,13 @@ * @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); } -- Gitblit v1.7.1