feat：h5成为会员-生成会员是否进入小黑屋的判断

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

@@ -981,7 +981,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         String videoRedisKey = "h5wxuser:video:duration:" + param.getVideoId();
         Long videoDuration = redisCache.getCacheObject(videoRedisKey);
         if (videoDuration == null) {
-            redisCache.setCacheObject(videoRedisKey, courseVideoDetails != null ? courseVideoDetails.getDuration() : 0);
+            redisCache.setCacheObject(videoRedisKey, courseVideoDetails != null ? courseVideoDetails.getDuration() != null ? courseVideoDetails.getDuration() : 0 : 0);
         }
         vo.setIsFinish(isFinish);
         vo.setPlayDuration(duration);

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -16,8 +16,10 @@ import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.DateUtils;
 import com.fs.company.cache.ICompanyUserCacheService;
+import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyTagUser;
 import com.fs.company.domain.CompanyUser;
+import com.fs.company.mapper.CompanyMapper;
 import com.fs.company.mapper.CompanyTagUserMapper;
 import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.company.service.ICompanyUserService;
@@ -100,6 +102,9 @@ public class FsUserServiceImpl implements IFsUserService
     @Autowired
     private CompanyTagUserMapper  companyTagUserMapper;
 
+    @Autowired
+    private CompanyMapper companyMapper;
+
     /**
      * 查询用户
      *
@@ -690,12 +695,18 @@ public class FsUserServiceImpl implements IFsUserService
         if (Objects.isNull(companyUser)){
             return ResponseResult.fail(500,"销售不存在");
         }
-        // todo 根据公司判断是否需要启用
-
 
         // 关联销售
         fsUser.setCompanyId(param.getCompanyId());
         fsUser.setCompanyUserId(param.getCompanyUserId());
+
+        // 特殊（需求设计：需要根据公司是否开启黑名单来设置会员初始化的状态）
+        Company company = null;
+        if(param.getCompanyId() != null) {
+            company = companyMapper.selectCompanyById(param.getCompanyId());
+        }
+        // isDefaultBlack 值为1 ，表示需要加入小黑屋，否则不加
+        fsUser.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
         fsUserMapper.updateFsUser(fsUser);
 
         // 不为空则添加新标签