diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 6526fc365..cff91b4f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -289,7 +289,12 @@ public class WxMallServiceImpl implements WxMallService { wxMall.setTenantId("-1"); this.save(wxMall); wxMall.setTenantId(wxMall.getId().toString()); - + }else{ + WxMall byId = this.getById(wxMall.getId()); + if(byId == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到组织"); + } + wxMall.updateTenantInfo(byId.getTenantInfo()); } this.update(wxMall); @@ -319,6 +324,9 @@ public class WxMallServiceImpl implements WxMallService { userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); }else{ MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); + if(oldUser == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到管理员"); + } if(!oldUser.getTenantId().equals(userInfo.getTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配"); } diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java index 55a7bacab..416c3f9df 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java +++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java @@ -45,7 +45,7 @@ public class AliyunVedioServer { /** * 获取视频上传地址和凭证 - * @param client 发送请求客户端 + * @param * @return CreateUploadVideoResponse 获取视频上传地址和凭证响应数据 * @throws Exception */ @@ -187,6 +187,8 @@ public class AliyunVedioServer { try { GetPlayInfoRequest request = new GetPlayInfoRequest(); request.setVideoId(videoId); + request.setAuthTimeout(2592000l);//30天有效 +// request.setOutputType("oss"); return client.getAcsResponse(request); } catch (Exception e) { log.error("getVedioUrl error.",e);