日志管理

jiangqs

2023-06-27 046d7ac5bbef4cbb6c6b64f3589e2722d13a07a5

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java

@@ -12,15 +12,14 @@
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;

/**
@@ -30,21 +29,21 @@
 * @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;

    @Autowired
    @Resource
    private AgencyTaskService agencyTaskService;

    @Autowired
    @Resource
    private AgencyTaskRecordService agencyTaskRecordService;

    @RequestMapping(value = "/pageMerMemberTask", method = RequestMethod.POST)
@@ -104,7 +103,7 @@
    }

    @RequestMapping(value = "/pageMerAgencyTaskRecord", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户会员跟进任务记录列表")
    @ApiOperation(value = "分页获取商户代理商跟进任务记录列表")
    public R<Page<MerAgencyTaskRecordPageVo>> pageMerAgencyTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
        Long userId = SecurityUtils.getUserId();
        merAgencyTaskPageDto.setUserId(userId);
@@ -116,7 +115,7 @@
    }

    @RequestMapping(value = "/createAgencyTask", method = RequestMethod.POST)
    @ApiOperation(value = "新建会员跟进任务")
    @ApiOperation(value = "新建代理商跟进任务")
    public R createAgencyTask(@RequestBody MerCreateAgencyTaskDto merCreateAgencyTaskDto) {
        Long userId = SecurityUtils.getUserId();
        merCreateAgencyTaskDto.setUserId(userId);
@@ -125,7 +124,7 @@
    }

    @RequestMapping(value = "/followAgencyTask", method = RequestMethod.POST)
    @ApiOperation(value = "会员任务跟进")
    @ApiOperation(value = "会员代理商跟进")
    public R followAgencyTask(@RequestBody MerFollowAgencyTaskDto merFollowAgencyTaskDto) {
        Long userId = SecurityUtils.getUserId();
        merFollowAgencyTaskDto.setUserId(userId);