From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 536d4d5..8f5eb37 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
@@ -1,13 +1,15 @@
package com.ruoyi.shop.controller.management;
-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.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.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 io.swagger.annotations.Api;
@@ -41,6 +43,9 @@
@Resource
private ShopTaskRecordService shopTaskRecordService;
+ @Resource
+ private MemberTaskRecordService memberTaskRecordService;
+
@RequestMapping(value = "/followShopTask", method = RequestMethod.POST)
@ApiOperation(value = "商户跟进")
public R followShopTask(@RequestBody MgtFollowShopTaskDto mgtFollowShopTaskDto) {
@@ -52,26 +57,28 @@
@RequestMapping(value = "/pageMgtShopFollow", method = RequestMethod.POST)
@ApiOperation(value = "平台获取平台跟进列表")
- public R<Page<MgtShopTaskRecordPageVo>> pageMgtShopFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
+ public R<List<MgtShopTaskRecordPageVo>> pageMgtShopFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
Long userId = SecurityUtils.getUserId();
mgtShopTaskPageDto.setUserId(userId);
- Page<MgtShopTaskRecordPageVo> page = new Page<>();
- page.setSize(mgtShopTaskPageDto.getPageSize());
- page.setCurrent(mgtShopTaskPageDto.getPageNum());
- List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordService.pageMgtShopFollow(page,mgtShopTaskPageDto);
- return R.ok(page.setRecords(mgtShopTaskRecordPageVoList));
+ List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordService.pageMgtShopFollow(mgtShopTaskPageDto);
+ return R.ok(mgtShopTaskRecordPageVoList);
}
@RequestMapping(value = "/pageMgtAgencyFollow", method = RequestMethod.POST)
@ApiOperation(value = "平台获取代理商跟进列表")
- public R<Page<MgtAgencyTaskRecordPageVo>> pageMgtAgencyFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
+ public R<List<MgtAgencyTaskRecordPageVo>> pageMgtAgencyFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
Long userId = SecurityUtils.getUserId();
mgtShopTaskPageDto.setUserId(userId);
- Page<MgtAgencyTaskRecordPageVo> page = new Page<>();
- page.setSize(mgtShopTaskPageDto.getPageSize());
- page.setCurrent(mgtShopTaskPageDto.getPageNum());
- List<MgtAgencyTaskRecordPageVo> mgtMemberFollowPageVoList = agencyTaskRecordService.pageMgtAgencyFollow(page,mgtShopTaskPageDto);
- return R.ok(page.setRecords(mgtMemberFollowPageVoList));
+ List<MgtAgencyTaskRecordPageVo> mgtMemberFollowPageVoList = agencyTaskRecordService.pageMgtAgencyFollow(mgtShopTaskPageDto);
+ return R.ok(mgtMemberFollowPageVoList);
}
+ @RequestMapping(value = "/pageMgtMemberFollow", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取用户跟进列表")
+ public R<List<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtMemberTaskPageDto.setUserId(userId);
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(mgtMemberTaskPageDto);
+ return R.ok(mgtMemberFollowPageVoList);
+ }
}
--
Gitblit v1.7.1