From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java
index 2469a76..a70a1dd 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java
@@ -1,10 +1,20 @@
package com.ruoyi.member.service.impl.member;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.member.domain.dto.AppMemberBrowseDto;
+import com.ruoyi.member.domain.dto.MerMemberBrowsePageDto;
+import com.ruoyi.member.domain.dto.MgtMemberBrowsePageDto;
import com.ruoyi.member.domain.pojo.member.BrowseRecord;
+import com.ruoyi.member.domain.vo.MerMemberBrowsePageVo;
+import com.ruoyi.member.domain.vo.MgtMemberBrowsePageVo;
import com.ruoyi.member.mapper.member.BrowseRecordMapper;
import com.ruoyi.member.service.member.BrowseRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.List;
/**
* <p>
@@ -17,4 +27,74 @@
@Service
public class BrowseRecordServiceImpl extends ServiceImpl<BrowseRecordMapper, BrowseRecord> implements BrowseRecordService {
+ @Resource
+ private BrowseRecordMapper browseRecordMapper;
+
+ /**
+ * 平台分页获取会员浏览记录
+ * @param page
+ * @param mgtMemberBrowsePageDto
+ * @return
+ */
+ @Override
+ public List<MgtMemberBrowsePageVo> pageMgtMemberBrowse(Page page, MgtMemberBrowsePageDto mgtMemberBrowsePageDto){
+ return browseRecordMapper.pageMgtMemberBrowse(page, mgtMemberBrowsePageDto);
+ }
+
+ /**
+ * @description 商户获取用户浏览记录
+ * @author jqs
+ * @date 2023/6/30 15:24
+ * @param page
+ * @param merMemberBrowsePageDto
+ * @return List<MerMemberBrowsePageVo>
+ */
+ @Override
+ public List<MerMemberBrowsePageVo> pageMerMemberBrowse(Page page, MerMemberBrowsePageDto merMemberBrowsePageDto){
+ return browseRecordMapper.pageMerMemberBrowse(page, merMemberBrowsePageDto);
+ }
+
+ /**
+ * @description 浏览记录
+ * @author jqs
+ * @date 2023/7/28 10:27
+ * @param appMemberBrowseDto
+ * @return void
+ */
+ @Override
+ public void browseRecord(AppMemberBrowseDto appMemberBrowseDto){
+ BrowseRecord browseRecord = new BrowseRecord();
+ browseRecord.setDelFlag(0);
+ browseRecord.setUserId(appMemberBrowseDto.getUserId());
+ browseRecord.setBrowseType(appMemberBrowseDto.getBrowseType());
+ browseRecord.setBrowseId(appMemberBrowseDto.getBrowseId());
+ browseRecord.setBrowseName(appMemberBrowseDto.getBrowseName());
+ browseRecord.setCreateTime(appMemberBrowseDto.getStartTime());
+ browseRecord.setQuitTime(appMemberBrowseDto.getEndTime());
+ Calendar startCalendar = Calendar.getInstance();
+ startCalendar.setTime(appMemberBrowseDto.getStartTime());
+ Calendar endCalendar = Calendar.getInstance();
+ endCalendar.setTime(appMemberBrowseDto.getEndTime());
+ // 计算时间差异
+ long milliseconds = endCalendar.getTimeInMillis() - startCalendar.getTimeInMillis();
+ int seconds = (int) (milliseconds / 1000) % 60;
+ int minutes = (int) ((milliseconds / (1000 * 60)) % 60);
+ int hours = (int) ((milliseconds / (1000 * 60 * 60)) % 24);
+ if(hours==0&&minutes==0&&seconds<60){
+ seconds = 0;
+ minutes = 1;
+ }
+ String browseTime = "";
+ if(hours>0){
+ browseTime = browseTime + hours + "小时 ";
+ }
+ if(minutes>0){
+ browseTime = browseTime + minutes + "分钟 ";
+ }
+ if(seconds>0){
+ browseTime = browseTime + seconds + "秒";
+ }
+ browseRecord.setBrowseTime(browseTime);
+ this.saveOrUpdate(browseRecord);
+ }
}
--
Gitblit v1.7.1