From 39748c770c83ff1b1e4593c5f24b147361e587c0 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 11:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 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..0b9bbc9 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,11 +3,13 @@
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.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.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;
@@ -28,7 +30,7 @@
* @date 2023年05月06日
* @version: 1.0
*/
-@Api(value = "商户端会员相关接口", tags = "商户端会员相关接口", description = "商户端会员相关接口")
+@Api(value = "商户端任务相关接口", tags = "商户端任务相关接口", description = "商户端任务相关接口")
@RestController
@RequestMapping("/mer/task")
public class MerTaskController {
@@ -38,6 +40,12 @@
@Autowired
private MemberTaskRecordService memberTaskRecordService;
+
+ @Autowired
+ private AgencyTaskService agencyTaskService;
+
+ @Autowired
+ private AgencyTaskRecordService agencyTaskRecordService;
@RequestMapping(value = "/pageMerMemberTask", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户会员跟进任务列表")
@@ -73,11 +81,55 @@
}
@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 = "/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