From bb58e108a9da48d84b84d30b73c01106dd642550 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 02 八月 2023 19:58:49 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 82 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 11 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 fa406c1..7ac7379 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
@@ -3,22 +3,20 @@
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.MerCreateMemberTaskDto;
-import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
-import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
-import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
-import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.dto.*;
+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;
/**
@@ -28,16 +26,22 @@
* @date 2023年05月06日
* @version: 1.0
*/
-@Api(value = "商户端会员相关接口", tags = "商户端会员相关接口", description = "商户端会员相关接口")
+@Api(value = "商户端任务相关接口", tags = "商户端任务相关接口", description = "商户端任务相关接口")
@RestController
@RequestMapping("/mer/task")
public class MerTaskController {
- @Autowired
+ @Resource
private MemberTaskService memberTaskService;
- @Autowired
+ @Resource
private MemberTaskRecordService memberTaskRecordService;
+
+ @Resource
+ private AgencyTaskService agencyTaskService;
+
+ @Resource
+ private AgencyTaskRecordService agencyTaskRecordService;
@RequestMapping(value = "/pageMerMemberTask", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户会员跟进任务列表")
@@ -73,11 +77,67 @@
}
@RequestMapping(value = "/followMemberTask", method = RequestMethod.POST)
- @ApiOperation(value = "任务跟进")
+ @ApiOperation(value = "会员任务跟进")
public R followMemberTask(@RequestBody MerFollowMemberTaskDto merFollowMemberTaskDto) {
Long userId = SecurityUtils.getUserId();
merFollowMemberTaskDto.setUserId(userId);
memberTaskService.followMemberTask(merFollowMemberTaskDto);
return R.ok();
}
+
+
+
+ @RequestMapping(value = "/pageMerAgencyTask", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户代理商跟进任务列表")
+ public R<Page<MerAgencyTaskPageVo>> pageMerAgencyTask(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merAgencyTaskPageDto.setUserId(userId);
+ Page<MerAgencyTaskPageVo> page = new Page<>();
+ page.setSize(merAgencyTaskPageDto.getPageSize());
+ 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)
+ @ApiOperation(value = "分页获取商户代理商跟进任务记录列表")
+ public R<Page<MerAgencyTaskRecordPageVo>> pageMerAgencyTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merAgencyTaskPageDto.setUserId(userId);
+ Page<MerAgencyTaskRecordPageVo> page = new Page<>();
+ page.setSize(merAgencyTaskPageDto.getPageSize());
+ page.setCurrent(merAgencyTaskPageDto.getPageNum());
+ List<MerAgencyTaskRecordPageVo> merAgencyTaskRecordPageVoList = agencyTaskRecordService.pageMerAgencyTaskRecord(page,merAgencyTaskPageDto);
+ return R.ok(page.setRecords(merAgencyTaskRecordPageVoList));
+ }
+
+ @RequestMapping(value = "/createAgencyTask", method = RequestMethod.POST)
+ @ApiOperation(value = "新建代理商跟进任务")
+ public R createAgencyTask(@RequestBody MerCreateAgencyTaskDto merCreateAgencyTaskDto) {
+ Long userId = SecurityUtils.getUserId();
+ merCreateAgencyTaskDto.setUserId(userId);
+ agencyTaskService.createAgencyTask(merCreateAgencyTaskDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/followAgencyTask", method = RequestMethod.POST)
+ @ApiOperation(value = "代理商跟进")
+ public R followAgencyTask(@RequestBody MerFollowAgencyTaskDto merFollowAgencyTaskDto) {
+ Long userId = SecurityUtils.getUserId();
+ merFollowAgencyTaskDto.setUserId(userId);
+ agencyTaskService.followAgencyTask(merFollowAgencyTaskDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1