From 3fb8fc0d2093a0646b11e5f2dc3b78bd6b633635 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 14 六月 2023 18:40:26 +0800
Subject: [PATCH] 活动管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
index b16bb5d..ef5c37d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
@@ -3,26 +3,24 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
-import com.ruoyi.shop.domain.vo.MgtShopTagVo;
import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
+import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -45,6 +43,9 @@
@Resource
private ShopTaskRecordService shopTaskRecordService;
+
+ @Resource
+ private MemberTaskRecordService memberTaskRecordService;
@RequestMapping(value = "/followShopTask", method = RequestMethod.POST)
@ApiOperation(value = "商户跟进")
@@ -79,4 +80,15 @@
return R.ok(page.setRecords(mgtMemberFollowPageVoList));
}
+ @RequestMapping(value = "/pageMgtMemberFollow", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取用户跟进列表")
+ public R<Page<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtMemberTaskPageDto.setUserId(userId);
+ Page<MgtMemberFollowPageVo> page = new Page<>();
+ page.setSize(mgtMemberTaskPageDto.getPageSize());
+ page.setCurrent(mgtMemberTaskPageDto.getPageNum());
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(page, mgtMemberTaskPageDto);
+ return R.ok(page.setRecords(mgtMemberFollowPageVoList));
+ }
}
--
Gitblit v1.7.1