From fab844ecb6ff7c55a625b54e5481e0a2ab13abff Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 01 六月 2023 18:11:52 +0800
Subject: [PATCH] 商户管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
index ee2bbb8..b639b88 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.shop.service.impl.task;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
@@ -9,17 +11,12 @@
import com.ruoyi.shop.mapper.task.MemberTaskRecordMapper;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
-import com.ruoyi.shop.util.FileConvertUtils;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.StringJoiner;
import java.util.stream.Collectors;
/**
@@ -84,16 +81,14 @@
* @return
*/
@Override
- public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page){
- List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page);
+ public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page, MgtMemberTaskPageDto mgtMemberTaskPageDto){
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page, mgtMemberTaskPageDto);
if(mgtMemberFollowPageVoList!=null&&!mgtMemberFollowPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
List<String> picture = new ArrayList<>();
List<String> video = new ArrayList<>();
List<String> audio = new ArrayList<>();
- Long shopId;
- Shop shop;
for(MgtMemberFollowPageVo mgtMemberFollowPageVo : mgtMemberFollowPageVoList){
followId = mgtMemberFollowPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
--
Gitblit v1.7.1