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/impl/order/UserServiceRecordServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
index 8684527..f905d5c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
@@ -5,9 +5,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.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 com.ruoyi.order.mapper.order.UserServiceRecordMapper;
import com.ruoyi.order.service.order.UserServiceRecordService;
import org.springframework.stereotype.Service;
@@ -41,7 +44,7 @@
}
/**
- *
+ * 商户分页获取用户服务记录
* @param page
* @param merServiceRecordPageDto
* @return
@@ -50,4 +53,37 @@
public List<MerServiceRecordPageVo> pageMerMemberServiceRecord(Page page, MerServiceRecordPageDto merServiceRecordPageDto){
return userServiceRecordMapper.pageMerMemberServiceRecord(page, merServiceRecordPageDto);
}
+
+ /**
+ * 平台分页获取用户服务记录
+ * @param page
+ * @param mgtMemberServiceRecordPageDto
+ * @return
+ */
+ @Override
+ public List<MgtMemberServiceRecordPageVo> pageMgtMemberServiceRecord(Page page, MgtMemberServiceRecordPageDto mgtMemberServiceRecordPageDto){
+ return userServiceRecordMapper.pageMgtMemberServiceRecord(page, mgtMemberServiceRecordPageDto);
+ }
+
+ /**
+ * 通过用户id获取会员服务统计
+ * @param userId
+ * @return
+ */
+ @Override
+ public MgtMemberServiceTotalVo getMgtMemberServiceTotal(Long userId){
+ return userServiceRecordMapper.getMgtMemberServiceTotal(userId);
+ }
+
+ /**
+ * @description 统计商户到店人数
+ * @author jqs
+ * @date 2023/6/25 17:17
+ * @param shopId
+ * @return Integer
+ */
+ @Override
+ public Integer countShopServicePerson(Long shopId){
+ return userServiceRecordMapper.countShopServicePerson(shopId);
+ }
}
--
Gitblit v1.7.1