|
@@ -940,13 +940,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
//2、如果只绑定了当前销售,需要添加看课记录(正常流程);
|
|
|
//3、以上都不是,则标识重粉,需要加入关系表,并打上重粉标签
|
|
|
if(fsUser.getCompanyUserId() == null) {
|
|
|
- return ResponseResult.fail(BizResponseEnum.DATA_NOT_EXIST,companyUser.getQrCodeWeixin());
|
|
|
+ return ResponseResult.fail(BizResponseEnum.DATA_NOT_EXIST, getCompanyUserQRCode(companyUser));
|
|
|
}
|
|
|
|
|
|
// 如果开启了黑名单审核,需要提示
|
|
|
if(fsUser.getStatus() == 0) {
|
|
|
// return ResponseResult.fail(505, "管理开启了会员审核,请等待审核");
|
|
|
- return ResponseResult.fail(BizResponseEnum.WAIT_APPROVAL,companyUser.getQrCodeWeixin());
|
|
|
+ return ResponseResult.fail(BizResponseEnum.WAIT_APPROVAL,getCompanyUserQRCode(companyUser));
|
|
|
}
|
|
|
|
|
|
//查询看课记录
|
|
@@ -1005,6 +1005,18 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
return ResponseResult.ok(Boolean.TRUE);
|
|
|
}
|
|
|
|
|
|
+ private String getCompanyUserQRCode(CompanyUser companyUser) {
|
|
|
+ String companyUserQRCode;
|
|
|
+ if(StringUtils.isNotEmpty(companyUser.getQrCodeWeixin())){
|
|
|
+ companyUserQRCode = companyUser.getQrCodeWeixin();
|
|
|
+ } else {
|
|
|
+ String json = configService.selectConfigByKey("course.config");
|
|
|
+ CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
|
|
|
+ companyUserQRCode = config.getCompanyUserQRCode();
|
|
|
+ }
|
|
|
+ return companyUserQRCode;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public ResponseResult<FsUserCourseVideoLinkDetailsVO> getLinkCourseVideoDetails(FsUserCourseVideoLinkParam param) {
|
|
|
// FsUserCoursePeriodDays periodDays = new FsUserCoursePeriodDays();
|