From 1772afb069b75871572c9c438bbd2bc403f864df Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 11:43:51 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
index 0b9bbc9..e66bd9e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
@@ -4,23 +4,19 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo;
-import com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo;
-import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
-import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.AgencyTaskService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.MemberTaskService;
-import com.ruoyi.system.api.domain.poji.member.Member;
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;
/**
@@ -35,16 +31,16 @@
@RequestMapping("/mer/task")
public class MerTaskController {
- @Autowired
+ @Resource
private MemberTaskService memberTaskService;
- @Autowired
+ @Resource
private MemberTaskRecordService memberTaskRecordService;
- @Autowired
+ @Resource
private AgencyTaskService agencyTaskService;
- @Autowired
+ @Resource
private AgencyTaskRecordService agencyTaskRecordService;
@RequestMapping(value = "/pageMerMemberTask", method = RequestMethod.POST)
@@ -89,8 +85,6 @@
return R.ok();
}
-
-
@RequestMapping(value = "/pageMerAgencyTask", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户代理商跟进任务列表")
public R<Page<MerAgencyTaskPageVo>> pageMerAgencyTask(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
@@ -101,6 +95,18 @@
page.setCurrent(merAgencyTaskPageDto.getPageNum());
List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskService.pageMerAgencyTask(page,merAgencyTaskPageDto);
return R.ok(page.setRecords(merAgencyTaskPageVoList));
+ }
+
+ @RequestMapping(value = "/pageMerAgencySimpleTaskRecord", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户代理商简易跟进任务记录列表")
+ public R<Page<MerAgencySimpleTaskRecordPageVo>> pageMerAgencySimpleTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merAgencyTaskPageDto.setUserId(userId);
+ Page<MerAgencySimpleTaskRecordPageVo> page = new Page<>();
+ page.setSize(merAgencyTaskPageDto.getPageSize());
+ page.setCurrent(merAgencyTaskPageDto.getPageNum());
+ List<MerAgencySimpleTaskRecordPageVo> merAgencySimpleTaskRecordPageVos = agencyTaskService.pageMerAgencySimpleTaskRecord(page,merAgencyTaskPageDto);
+ return R.ok(page.setRecords(merAgencySimpleTaskRecordPageVos));
}
@RequestMapping(value = "/pageMerAgencyTaskRecord", method = RequestMethod.POST)
@@ -125,7 +131,7 @@
}
@RequestMapping(value = "/followAgencyTask", method = RequestMethod.POST)
- @ApiOperation(value = "会员代理商跟进")
+ @ApiOperation(value = "代理商跟进")
public R followAgencyTask(@RequestBody MerFollowAgencyTaskDto merFollowAgencyTaskDto) {
Long userId = SecurityUtils.getUserId();
merFollowAgencyTaskDto.setUserId(userId);
--
Gitblit v1.7.1