From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/UserServiceRecordService.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/UserServiceRecordService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/UserServiceRecordService.java
index 9b981a0..d04fccb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/UserServiceRecordService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/UserServiceRecordService.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.extension.service.IService;
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 java.util.List;
@@ -25,4 +30,36 @@
* @return
*/
List<AppServiceRecordPageVo> pageUserServiceRecord(Page page, AppConsumerPageDto appConsumerPageDto);
+
+ /**
+ * 商户分页获取用户服务记录
+ * @param page
+ * @param merServiceRecordPageDto
+ * @return
+ */
+ List<MerServiceRecordPageVo> pageMerMemberServiceRecord(Page page, MerServiceRecordPageDto merServiceRecordPageDto);
+
+ /**
+ * 平台分页获取用户服务记录
+ * @param page
+ * @param mgtMemberServiceRecordPageDto
+ * @return
+ */
+ List<MgtMemberServiceRecordPageVo> pageMgtMemberServiceRecord(Page page, MgtMemberServiceRecordPageDto mgtMemberServiceRecordPageDto);
+
+ /**
+ * 通过用户id获取会员服务统计
+ * @param userId
+ * @return
+ */
+ MgtMemberServiceTotalVo getMgtMemberServiceTotal(Long userId);
+
+ /**
+ * @description 统计商户到店人数
+ * @author jqs
+ * @date 2023/6/25 17:17
+ * @param shopId
+ * @return Integer
+ */
+ Integer countShopServicePerson(Long shopId);
}
--
Gitblit v1.7.1