From 981aacc8d5de2638a0f5b3eb2585e64cfaf2807d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 七月 2025 18:01:19 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 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..e56b15a 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
@@ -1,10 +1,15 @@
 package com.ruoyi.order.mapper.order;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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,37 @@
      * @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);
+
+    /**
+     * @param shopId
+     * @return Integer
+     * @description 统计商户到店人数
+     * @author jqs
+     * @date 2023/6/25 17:17
+     */
+    List<Integer> countShopServicePerson(@Param("shopId") Long shopId);
+
 }

--
Gitblit v1.7.1