跟进任务初始化

coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java

@@ -1,7 +1,6 @@
 package com.cool.store;
 
 import com.zaxxer.hikari.HikariDataSource;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
@@ -10,6 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
+import tk.mybatis.spring.annotation.MapperScan;
 
 import javax.sql.DataSource;
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java

@@ -0,0 +1,79 @@
+package com.cool.store.controller;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.follow.AddFollowLogRequest;
+import com.cool.store.request.follow.AddFollowTaskRequest;
+import com.cool.store.request.follow.FollowTaskIdRequest;
+import com.cool.store.request.follow.UpdateFollowTaskRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.FollowTaskService;
+import com.cool.store.vo.follow.FollowTaskLogVO;
+import com.cool.store.vo.follow.FollowTaskPageVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: FollowTaskController
+ * @Description:
+ * @date 2023-08-08 14:35
+ */
+@RestController
+@Slf4j
+@Api(tags = "跟进任务")
+public class FollowTaskController {
+
+    @Resource
+    private FollowTaskService followTaskService;
+
+    @ApiOperation("工作台获取跟进任务")
+    @GetMapping("/follow/task/page")
+    public ResponseResult<PageInfo<FollowTaskPageVO>> getFollowTaskPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize,
+                                                                        @RequestParam("taskStatus")Integer taskStatus, @RequestParam(value = "queryDate", required = false) String queryDate){
+        return ResponseResult.success(followTaskService.getFollowTaskPage(pageNum, pageSize, taskStatus, queryDate, CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("获取线索跟进日志")
+    @GetMapping("/follow/log/page")
+    public ResponseResult<PageInfo<FollowTaskLogVO>> getFollowLogPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, @RequestParam("partnerLineId")Long partnerLineId){
+        return ResponseResult.success(followTaskService.getFollowLogPage(pageNum, pageSize, partnerLineId));
+    }
+
+    @ApiOperation("添加跟进日志")
+    @PostMapping("/follow/log/add")
+    public ResponseResult<Integer> addFollowLog(@RequestBody @Validated AddFollowLogRequest request){
+        return ResponseResult.success(followTaskService.addFollowLog(request, CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("新增跟进任务")
+    @PostMapping("/follow/task/add")
+    public ResponseResult<Long> addFollowTask(@RequestBody @Validated AddFollowTaskRequest request){
+        return ResponseResult.success(followTaskService.addFollowTask(request, CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("编辑跟进任务")
+    @PostMapping("/follow/task/update")
+    public ResponseResult<Integer> updateFollowTask(@RequestBody @Validated UpdateFollowTaskRequest request){
+        return ResponseResult.success(followTaskService.updateFollowTask(request, CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("完成跟进任务")
+    @PostMapping("/follow/task/finish")
+    public ResponseResult<Integer> finishFollowTask(@RequestBody @Validated FollowTaskIdRequest request){
+        return ResponseResult.success(followTaskService.finishFollowTask(request, CurrentUserHolder.getUserId()));
+    }
+
+    @ApiOperation("作废跟进任务")
+    @PostMapping("/follow/task/cancel")
+    public ResponseResult<Integer> cancelFollowTask(@RequestBody @Validated FollowTaskIdRequest request){
+        return ResponseResult.success(followTaskService.cancelFollowTask(request, CurrentUserHolder.getUserId()));
+    }
+
+}

coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java

@@ -258,7 +258,7 @@ public class TestController {
     }
 
     @GetMapping("/getWechatAccessToken")
-    public ResponseResult getWechatAccessToken(@RequestParam(value = "appId")String appId, @RequestParam("appSecret")String appSecret){
+    public ResponseResult getWechatAccessToken(@RequestParam(value = "appId")String appId, @RequestParam("appSecret")String appSecret) {
         try {
             return ResponseResult.success(isvHttpRequest.getWechatAccessToken(appId, appSecret));
         } catch (ApiException e) {