From f2f07f9c707dc4793c42c90c4039b41a59c3d0f2 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 26 六月 2023 19:51:23 +0800 Subject: [PATCH] 商户端和管理台联调bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java index 407062f..d7987fe 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java @@ -5,9 +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.AppBaseGetDto; +import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.vo.AppOrderTotalVo; 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 java.util.List; @@ -174,4 +176,96 @@ * @return MgtOrderDetailVo */ MgtOrderDetailVo getMgtOrderDetail(String orderId); + + + /** + * @description boardOrderTotal + * @param + * @return MgtBulletinBoardVo + * @author jqs34 + * @date 2023/6/18 17:20 + */ + MgtBulletinBoardVo boardOrderTotal(); + + /** + * @description 获取商户订单统计 + * @param mgtBaseShopDto + * @return MgtTotalOrderTotalVo + * @author jqs34 + * @date 2023/6/19 22:23 + */ + MgtTotalOrderTotalVo getTotalOrderTotal(MgtBaseShopDto mgtBaseShopDto); + + + /** + * @description 获取商户活动统计 + * @author jqs + * @date 2023/6/20 9:28 + * @param mgtBaseShopDto + * @return MgtTotalActivityTotalVo + */ + MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto); + + /** + * @description 获取商户活动年龄分布 + * @author jqs + * @date 2023/6/20 9:57 + * @param mgtActivityAgeDto + * @return MgtTotalActivityTotalVo + */ + MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto); + + /** + * @description 获取商户数据统计 + * @author jqs + * @date 2023/6/20 15:50 + * @param mgtBaseShopDto + * @return MgtTotalDataTotalVo + */ + MgtTotalDataTotalVo getTotalDataTotal(MgtBaseShopDto mgtBaseShopDto); + + /** + * @description + * @author jqs + * @date 2023/6/21 15:27 + * @param mgtBasePlatformDto + * @return List<MgtMapTotalVo> + */ + List<MgtMapTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto); + + /** + * @description 获取平台商户数据统计 + * @param mgtBasePlatformDto + * @return List<MgtTotalDataTotalVo> + * @author jqs34 + * @date 2023/6/23 14:01 + */ + List<MgtTotalDataTotalVo> getPlTotalDataTotal(MgtBasePlatformDto mgtBasePlatformDto); + + /** + * @description 获取平台商户订单统计 + * @param mgtBasePlatformDto + * @return MgtTotalOrderTotalVo + * @author jqs34 + * @date 2023/6/19 22:23 + */ + MgtTotalOrderTotalVo getPlTotalOrderTotal(MgtBasePlatformDto mgtBasePlatformDto); + + /** + * @description 获取商户活动统计 + * @author jqs + * @date 2023/6/20 9:28 + * @param mgtBasePlatformDto + * @return MgtTotalActivityTotalVo + */ + MgtPlTotalActivityTotalVo getPlTotalActivityTotal(MgtBasePlatformDto mgtBasePlatformDto); + + /** + * @description 获取商户活动年龄分布 + * @author jqs + * @date 2023/6/20 9:57 + * @param mgtPLActivityAgeDto + * @return MgtTotalActivityTotalVo + */ + MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto); } -- Gitblit v1.7.1