suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiaodong.hu
2023-11-15 19:06:01 +08:00
parent 59828a3e56 b04e42b672
commit 6c4e1028b1
62 changed files with 1515 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-webc/pom.xml
View File

@@ -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>
<build>

6
coolstore-partner-webc/src/main/java/com/cool/store/controller/FeiShuController.java
View File

@@ -17,16 +17,22 @@ import org.springframework.web.bind.annotation.RestController;
* @Author: young.yu
* @Date: 2023-06-16 13:06
* @Description:
* @deprecated {@link InterviewController}
*/
@Api(tags = "飞书相关接口")
@RestController
@RequestMapping({"/feishu"})
@Deprecated
public class FeiShuController {
/**
* @deprecated {@link 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);

9
coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java
View File

@@ -6,6 +6,7 @@ import com.cool.store.dto.partner.PartnerGetPassLetterDetailDto;
import com.cool.store.dto.partner.PartnerQueryInterviewDto;
import com.cool.store.exception.ApiException;
import com.cool.store.request.CreateAppointmentReq;
import com.cool.store.request.GetFreeBusyListReq;
import com.cool.store.request.ModifyInterviewTimeReq;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.InterviewService;
@@ -14,6 +15,7 @@ import com.cool.store.vo.EnterInterviewVO;
import com.cool.store.vo.PartnerInterviewInfoVO;
import com.cool.store.vo.PartnerPassLetterDetailVO;
import com.cool.store.vo.interview.CreateAppointmentVO;
import com.cool.store.vo.interview.GetFreeBusyListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,13 @@ public class InterviewController {
// return ResponseResult.success(interviewService.queryByPartnerId(dto.getPartnerId()));
// }
@PostMapping("/freebusy/list")
@ApiOperation("查询各预约时间段情况")
public ResponseResult<GetFreeBusyListVO> getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException {
GetFreeBusyListVO getFreeBusyListVO= interviewService.getFreeBusyList(request);
return ResponseResult.success(getFreeBusyListVO);
}
@PostMapping("/queryByPartnerLineId")
@ApiOperation("根据线索id查询面试信息")
public ResponseResult<PartnerInterviewInfoVO> queryByPartnerLineId(@RequestBody LineQueryInterviewDto dto) throws ApiException {