|
|
@@ -12,8 +12,6 @@ import com.fs.common.enums.BizResponseEnum;
|
|
|
import com.fs.common.utils.DateUtils;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.date.DateUtil;
|
|
|
-import com.fs.company.domain.Company;
|
|
|
-import com.fs.company.domain.CompanyMoneyLogs;
|
|
|
import com.fs.company.domain.CompanyUser;
|
|
|
import com.fs.company.mapper.CompanyUserMapper;
|
|
|
import com.fs.course.config.CourseConfig;
|
|
|
@@ -65,7 +63,6 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.security.core.parameters.P;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -1176,12 +1173,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
}
|
|
|
|
|
|
// 逻辑调整：如果会员已经绑定了销售，直接提示，不添加重粉数据了-2025年6月16日14点53分
|
|
|
- if (fsUser.getCompanyUserId() != null && !param.getCompanyUserId().equals(fsUser.getCompanyUserId())){
|
|
|
+ if (!param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
|
|
|
return ResponseResult.fail(500,"该用户("+fsUser.getUserId() + ")已成为其他销售会员");
|
|
|
}
|
|
|
|
|
|
// 如果开启了黑名单审核，需要提示
|
|
|
- if(fsUser.getStatus() == 0) {
|
|
|
+ if(userCompanyUser.getStatus() == 0) {
|
|
|
// return ResponseResult.fail(505, "管理开启了会员审核，请等待审核");
|
|
|
return ResponseResult.fail(BizResponseEnum.WAIT_APPROVAL,getCompanyUserQRCode(companyUser));
|
|
|
}
|
