From 57580ea090d7637f0ad462ea169dea4001a80490 Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期三, 28 六月 2023 00:08:50 +0800 Subject: [PATCH] 统计BUG --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 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 2349a06..4452b1e 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 @@ -9,10 +9,13 @@ 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.MgtMapBigTotalVo; import com.ruoyi.system.api.domain.vo.MgtMapTotalVo; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -186,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 @@ -195,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); /** @@ -326,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 @@ -335,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 @@ -382,7 +385,7 @@ * @param mgtActivityAgeDto * @return MgtTotalActivityTotalVo */ - MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto); + List<MgtMapTotalPlusVo> getPlTotalActivityAgeRank(@Param("param")MgtPlActivityAgeDto mgtActivityAgeDto); /** * @description listPlTotalShopActivityRank @@ -391,7 +394,7 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); + List<MgtMapBigTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); /** * @description listTotalActivityTotal @@ -400,7 +403,7 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listPlTotalShopActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); + List<MgtMapBigTotalVo> listPlTotalShopActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); /** * @description listTotalActivityTotal @@ -409,5 +412,23 @@ * @author jqs34 * @date 2023/6/19 22:48 */ - List<MgtMapTotalPlusVo> listPlTotalActivitySalesRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto); + 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 jqs + * @date 2023/6/27 19:13 + * @param mgtBaseShopDto + * @return BigDecimal + */ + BigDecimal shopSalesTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto); } -- Gitblit v1.7.1