From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期日, 04 六月 2023 13:13:54 +0800 Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java index c2a5d28..8e71980 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java @@ -2,9 +2,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.order.domain.dto.AppConsumerPageDto; +import com.ruoyi.order.domain.dto.MerServiceRecordPageDto; +import com.ruoyi.order.domain.dto.MgtMemberServiceRecordPageDto; import com.ruoyi.order.domain.pojo.order.UserServiceRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.order.domain.vo.AppServiceRecordPageVo; +import com.ruoyi.order.domain.vo.MerServiceRecordPageVo; +import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo; +import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,4 +31,29 @@ * @return */ List<AppServiceRecordPageVo> pageUserServiceRecord(Page page, @Param("param") AppConsumerPageDto appConsumerPageDto); + + /** + * + * @param page + * @param merServiceRecordPageDto + * @return + */ + List<MerServiceRecordPageVo> pageMerMemberServiceRecord(Page page,@Param("param") MerServiceRecordPageDto merServiceRecordPageDto); + + /** + * 平台分页获取用户服务记录 + * @param page + * @param mgtMemberServiceRecordPageDto + * @return + */ + List<MgtMemberServiceRecordPageVo> pageMgtMemberServiceRecord(Page page, @Param("param") MgtMemberServiceRecordPageDto mgtMemberServiceRecordPageDto); + + /** + * 通过用户id获取会员服务统计 + * @param userId + * @return + */ + MgtMemberServiceTotalVo getMgtMemberServiceTotal(@Param("userId")Long userId); + + } -- Gitblit v1.7.1