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

coolstore-partner-webb/pom.xml

@@ -43,6 +43,11 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- ELK -->
+        <dependency>
+            <groupId>com.github.danielwegener</groupId>
+            <artifactId>logback-kafka-appender</artifactId>
+        </dependency>
     </dependencies>
 
 

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

@@ -220,6 +220,25 @@ public class DeskController {
         return ResponseResult.success(hyPartnerLineInfoService.privateSeaLineList(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.FALSE));
     }
 
+    @PostMapping(path = "/getPrivateSeaPageDetailNext")
+    @ApiOperation("私海列表详情翻页")
+    public ResponseResult<LinePageInfoVo> getPrivateSeaPageDetailNext(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
+        return ResponseResult.success(hyPartnerLineInfoService.privateSeaPageDetailNext(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.FALSE));
+    }
+
+
+
+    @PostMapping(path = "/getPrivateAllSeaPageDetailNext")
+    @ApiOperation("全量私海列表详情翻页")
+    public ResponseResult<LinePageInfoVo> getPrivateAllSeaPageDetailNext(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
+        return ResponseResult.success(hyPartnerLineInfoService.privateSeaPageDetailNext(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.TRUE));
+    }
+
+    @PostMapping(path = "/getPublicSeaPageDetailNext")
+    @ApiOperation("公海列表详情翻页")
+    public ResponseResult<LinePageInfoVo> getPublicSeaPageDetailNext(@RequestBody LineRequest LineRequest){
+        return ResponseResult.success(hyPartnerLineInfoService.publicSeaPageDetailNext(CurrentUserHolder.getUserId(),LineRequest));
+    }
 
     @PostMapping(path = "/queryAllPrivateSeqLineList")
     @ApiOperation("全量私海")

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

@@ -17,16 +17,22 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author: young.yu
  * @Date: 2023-06-16  13:06
  * @Description:
+ * @deprecated {@link com.cool.store.controller.InterviewController}
  */
 @Api(tags = "飞书相关接口")
 @RestController
 @RequestMapping({"/feishu"})
+@Deprecated
 public class FeiShuController {
 
+    /**
+     * @deprecated {@link com.cool.store.controller.InterviewController#getFreeBusyList(GetFreeBusyListReq)}
+     */
     @Autowired
     private FeiShuService feiShuService;
     @PostMapping("/interviewer/freebusy/list")
     @ApiOperation("查询日程忙闲信息")
+    @Deprecated
     public ResponseResult<GetFreeBusyListVO> getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException {
         GetFreeBusyListVO getFreeBusyListVO= feiShuService.getFreeBusyList(request);
         return ResponseResult.success(getFreeBusyListVO);

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

@@ -4,8 +4,11 @@ import com.cool.store.dto.partner.EnterInterviewDto;
 import com.cool.store.exception.ApiException;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.service.FeiShuService;
 import com.cool.store.service.InterviewService;
 import com.cool.store.vo.EnterInterviewVO;
+import com.cool.store.vo.interview.CreateAppointmentVO;
+import com.cool.store.vo.interview.GetFreeBusyListVO;
 import com.cool.store.vo.interview.InterviewVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -54,6 +57,19 @@ public class InterviewController {
         return ResponseResult.success();
     }
 
+    @PostMapping("/freebusy/list")
+    @ApiOperation("查询各预约时间段情况")
+    public ResponseResult<GetFreeBusyListVO> getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException {
+        GetFreeBusyListVO getFreeBusyListVO= interviewService.getFreeBusyList(request);
+        return ResponseResult.success(getFreeBusyListVO);
+    }
+
+    @PostMapping("/appointment/booking")
+    @ApiOperation("招商经理主动预约面试")
+    public ResponseResult<CreateAppointmentVO> bookInterview(@RequestBody CreateAppointmentReq request) throws ApiException {
+        return ResponseResult.success(interviewService.bookInterview(request));
+    }
+
     @PostMapping("/modifyInterviewTime")
     @ApiOperation("修改面试时间")
     public ResponseResult modifyInterviewTime(@RequestBody ModifyInterviewTimeReq request) throws ApiException {

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

@@ -27,6 +27,7 @@ import com.cool.store.vo.cuser.IdentityCardInfoVO;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -67,6 +68,15 @@ public class TestController {
     @Autowired
     private WechatMiniAppService wechatMiniAppService;
 
+    @Value("${logging.config}")
+    private String loggingConfig;
+
+    @GetMapping("/log/config")
+    public String testLoggingConfig() {
+        log.debug("Test");
+        return loggingConfig;
+    }
+
     @PostMapping("/post")
     public ResponseResult<Boolean> get(@RequestBody List<TestRequest> testRequestList){
         log.info(JSONObject.toJSONString(testRequestList));