营期单独注册开关 看课小黑屋限制

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -2256,19 +2256,20 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService {
                         || companyUser.getIsNeedRegisterMember() == 1;
                 // 营期配置：当前公司是否在强制邀请列表中
                 boolean periodForceInvite = false;
-                if (!requireInvite
-                        && period != null
-                        && StringUtils.isNotEmpty(period.getIsNeedRegisterMember())) {
+                if (!requireInvite && StringUtils.isNotEmpty(period.getIsNeedRegisterMember())) {
                     String companyIdStr = String.valueOf(company.getCompanyId());
                     periodForceInvite = Arrays.stream(period.getIsNeedRegisterMember().split(","))
                             .map(String::trim)
                             .anyMatch(id -> id.equals(companyIdStr));
                 }
-                if (requireInvite || periodForceInvite) {
-                    return ResponseResult.fail(504, "请联系销售发送邀请链接成为会员！");
+                // 营期注册开关开启 → 直接进小黑屋（status=0），后续走审核流程
+                if (requireInvite||periodForceInvite) {
+                    userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), courseProject, companyUser.getCompanyId(), companyUser.getUserId(), 0);
+                } else {
+                    // 无营期开关 → 根据公司标识决定状态
+                    int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
+                    userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), courseProject, companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
                 }
-                int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
-                userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), courseProject, companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
             }
         }