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

Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904

Browse Source
This commit is contained in:
苏竹红
2023-09-06 09:40:23 +08:00
parent d2079aab77 7bd7474858
commit daa19bd83f
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-model/src/main/java/com/cool/store/request/CallRecordBackReq.java
View File

@@ -14,4 +14,16 @@ public class CallRecordBackReq {
@ApiModelProperty(value = "录音上传地址", required = true) @ApiModelProperty(value = "录音上传地址", required = true)
private String recordUrl; private String recordUrl;
@ApiModelProperty(value = "呼叫状态: 1-呼叫接听, 2-呼叫未接听, 3-呼叫失败", required = true)
private Integer callStatus;
@ApiModelProperty(value = "呼叫失败的情况下必传，说明呼叫失败的原因")
private String failReason;
@ApiModelProperty(value = "呼叫接听情况下必传，通话开始时间，格式：yyyy-MM-dd HH:mm:ss")
private String callStartTime;
@ApiModelProperty(value = "呼叫接听情况下必传，通话结束时间，格式：yyyy-MM-dd HH:mm:ss")
private String callEndTime;
} }

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/CallServiceImpl.java
View File

@@ -137,6 +137,12 @@ public class CallServiceImpl implements CallService {
if(callRecordDO == null){ if(callRecordDO == null){
throw new ApiException(ErrorCodeEnum.CALL_RECORD_NOT_EXIST_ERROR); throw new ApiException(ErrorCodeEnum.CALL_RECORD_NOT_EXIST_ERROR);
} }
callRecordDO.setCallStatus(request.getCallStatus());
callRecordDO.setFailReason(request.getFailReason());
if(StringUtils.isNotEmpty(request.getCallStartTime())&&StringUtils.isNotEmpty(request.getCallEndTime())){
callRecordDO.setCallStartTime(DateUtil.parse(request.getCallStartTime()));
callRecordDO.setCallEndTime(DateUtil.parse(request.getCallEndTime()));
}
callRecordDO.setRecordUrl(request.getRecordUrl()); callRecordDO.setRecordUrl(request.getRecordUrl());
callRecordDO.setUpdater("system-app"); callRecordDO.setUpdater("system-app");
callRecordDO.setUpdateTime(new Date()); callRecordDO.setUpdateTime(new Date());

12
coolstore-partner-webb/src/main/java/com/cool/store/controller/CallController.java
View File

@@ -37,12 +37,12 @@ public class CallController {
return ResponseResult.success(res); return ResponseResult.success(res);
} }
@PostMapping("/finish/callback") // @PostMapping("/finish/callback")
@ApiOperation("通话结束回调") // @ApiOperation("通话结束回调")
public ResponseResult callFinishBack(@RequestBody CallFinishBackReq request) throws ApiException { // public ResponseResult callFinishBack(@RequestBody CallFinishBackReq request) throws ApiException {
callService.callFinishBack(request); // callService.callFinishBack(request);
return ResponseResult.success(); // return ResponseResult.success();
} // }
@PostMapping("/record/callback") @PostMapping("/record/callback")
@ApiOperation("录音上传回调") @ApiOperation("录音上传回调")