Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

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

@@ -0,0 +1,51 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.DeskService;
+import com.cool.store.vo.desk.IntendPendingVO;
+import com.cool.store.vo.desk.InterviewPendingVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/26 17:49
+ * @Version 1.0
+ */
+@Api(tags = "工作台接口")
+@RestController
+@RequestMapping("pc/desk")
+public class DeskController {
+
+
+    @Resource
+    DeskService deskService;
+
+    @ApiOperation("待处理-加盟申请")
+    @GetMapping("/intendPendingList")
+    public ResponseResult<PageInfo<IntendPendingVO>> intendPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                     @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+//        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.intendPendingList(pageNumber,pageSize,"055740241221153440"));
+    }
+
+    @ApiOperation("待处理-邀约面谈")
+    @GetMapping("/interviewPendingList")
+    public ResponseResult<PageInfo<InterviewPendingVO>> interviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                             @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+//        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.interviewPendingList(pageNumber,pageSize,"055740241221153440"));
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.request.LineFollowLogRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.LineFollowService;
+import com.cool.store.vo.log.LineFollowLogVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: LineFollowController
+ * @Description:
+ * @date 2024-03-27 15:02
+ */
+@Api(tags = "跟进日志")
+@RestController
+@RequestMapping({"pc/follow"})
+public class LineFollowController {
+
+    @Resource
+    private LineFollowService lineFollowService;
+
+    @ApiOperation("跟进日志分页")
+    @GetMapping("/page")
+    public ResponseResult<PageInfo<LineFollowLogVO>> getFollowLogPage(Long lineId, Integer pageNum, Integer pageSize){
+        return ResponseResult.success(lineFollowService.getFollowLogPage(lineId, pageNum, pageSize));
+    }
+
+    @ApiOperation("新增跟进日志")
+    @PostMapping("/log/add")
+    public ResponseResult<Long> addFollowLog(@RequestBody LineFollowLogRequest request){
+        LoginUserInfo user = CurrentUserHolder.getUser();
+        return ResponseResult.success(lineFollowService.addFollowLog(request, user.getUserId(), user.getName()));
+    }
+
+}