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

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

Browse Source
This commit is contained in:
俞扬
2023-06-28 15:13:30 +08:00
parent ebdc60de1a a76b35edec
commit 42f5e08216
28 changed files with 175 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java
View File

@@ -52,10 +52,10 @@ public class TRTCCallbackFilter implements Filter {
log.error("腾讯云音视频回调签名生成错误，e：\t{}", e.getMessage());
return;
}
if (StringUtil.isEmpty(sign) || !newSign.equals(sign)) {
/*if (StringUtil.isEmpty(sign) || !newSign.equals(sign)) {
log.error("腾讯云音视频回调签名错误, sign：\t{}, newSign：\t{}", sign, newSign);
return;
}
}*/
filterChain.doFilter(servletRequest, servletResponse);
}

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

@@ -200,8 +200,8 @@ public class DeskController {
@PostMapping(path = "/transferInvestmentManager")
@ApiOperation("转让招商经理")
public ResponseResult<Boolean> transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request){
return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request.getUserId(),request.getUserName(),request.getLineId()));
public ResponseResult<Boolean> transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException {
return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request ));
}