Merge branch 'master' into dev/feat/partner1.5.2_20231121

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

@@ -52,6 +52,9 @@ public class TokenValidateFilter implements Filter {
                     "/partner/pc/flow/qualificationReview/callback",
                     "/**/ecSync/ecToApplet/**",
                     "/**/ecSync/labelInfo/**",
+                    "/**/ecSync/getCrmCreateTime/**",
+                    "/**/ecSync/historyLine/**",
+                    "/**/ecSync/historyLineTrajectory/**",
                     "/partner/pc/websocket/**",
                     "/partner/pc/call/**");
 

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

@@ -1,11 +1,11 @@
 package com.cool.store.controller;
 
 
+import com.cool.store.entity.HyPartnerEcTrackLogDO;
 import com.cool.store.request.CustomerInfoRequest;
 import com.cool.store.request.GetTagRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.EcSyncService;
-import com.cool.store.vo.InterviewScheduleInfoVO;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -24,15 +24,35 @@ public class EcSyncController {
     private EcSyncService ecSyncService;
 
     @PostMapping(path = "/ecToApplet")
-    @ApiOperation("ec同步数据到小程序")
+    @ApiOperation("ec同步数据到招商系统")
     public ResponseResult<Boolean> ecToApplet(@RequestBody List<CustomerInfoRequest> queryListData){
         return  ResponseResult.success(ecSyncService.ecToApplet(queryListData));
     }
 
     @PostMapping(path = "/labelInfo")
-    @ApiOperation("ec同步标签数据到小程序")
+    @ApiOperation("ec同步标签数据到招商系统")
     public ResponseResult<Boolean> labelInfo(@RequestBody List<GetTagRequest> getTagRequestList){
         return  ResponseResult.success(ecSyncService.labelInfo(getTagRequestList));
     }
 
+
+    @GetMapping(path = "/getCrmCreateTime")
+    @ApiOperation("ec同步标签数据到招商系统")
+    public ResponseResult<String> getCrmCreateTime(){
+        return  ResponseResult.success(ecSyncService.getLastCrmCreateTime());
+    }
+
+
+    @PostMapping(path = "/historyLine")
+    @ApiOperation("ec同步线索到招商系统")
+    public ResponseResult<Boolean> historyLine(@RequestBody List<CustomerInfoRequest> resultCustomerInfoList){
+        return  ResponseResult.success(ecSyncService.historyLine(resultCustomerInfoList));
+    }
+
+
+    @PostMapping(path = "/historyLineTrajectory")
+    @ApiOperation("ec同步跟进记录到招商系统")
+    public ResponseResult<Integer> historyLineTrajectory(@RequestBody List<HyPartnerEcTrackLogDO> resultTrajectoryList){
+        return  ResponseResult.success(ecSyncService.historyLineTrajectory(resultTrajectoryList));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.cool.store.controller;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.exception.ApiException;
+import com.cool.store.entity.HyPartnerEcTrackLogDO;
 import com.cool.store.request.follow.AddFollowLogRequest;
 import com.cool.store.request.follow.AddFollowTaskRequest;
 import com.cool.store.request.follow.FollowTaskIdRequest;
@@ -18,7 +19,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Date;
 
 /**
  * @author zhangchenbiao
@@ -47,6 +47,12 @@ public class FollowTaskController {
         return ResponseResult.success(followTaskService.getFollowLogPage(pageNum, pageSize, partnerLineId));
     }
 
+    @ApiOperation("获取线索ec跟进日志")
+    @GetMapping("/follow/ecLog/page")
+    public ResponseResult<PageInfo<HyPartnerEcTrackLogDO>> getEcFollowLogPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, @RequestParam("partnerId")String partnerId){
+        return ResponseResult.success(followTaskService.getEcFollowLogPage(pageNum, pageSize, partnerId));
+    }
+
     @ApiOperation("添加跟进日志")
     @PostMapping("/follow/log/add")
     public ResponseResult<Integer> addFollowLog(@RequestBody @Validated AddFollowLogRequest request){

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

@@ -6,11 +6,11 @@ import com.cool.store.request.AddLineRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LineHighSeasService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.validation.Valid;
 
 /**
@@ -39,4 +39,11 @@ public class LineHighSeasController {
     public ResponseResult importLine(@RequestParam(value = "file") MultipartFile file) throws Exception {
         return lineHighSeasService.importLine(file);
     }
+
+
+    @GetMapping("/addCheckout")
+    @ApiOperation("线索手机号校验")
+    public ResponseResult addCheckout(@Param("partnerMobile")String partnerMobile) throws ApiException {
+        return lineHighSeasService.addCheckout(partnerMobile);
+    }
 }