|
|
@@ -875,13 +875,18 @@ public class FsUserServiceImpl implements IFsUserService
|
|
|
return ResponseResult.fail(404,"当前用户信息不存在");
|
|
|
}
|
|
|
|
|
|
+ // 逻辑调整：如果会员已经绑定了销售，直接提示，不添加重粉数据了-2025年6月16日14点53分
|
|
|
+ if (fsUser.getCompanyUserId() != null && !param.getCompanyUserId().equals(fsUser.getCompanyUserId())){
|
|
|
+ return ResponseResult.fail(406,"该用户已成为其他销售会员");
|
|
|
+ }
|
|
|
+
|
|
|
//判断该销售是否存在
|
|
|
CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getCompanyUserId());
|
|
|
if (Objects.isNull(companyUser)){
|
|
|
return ResponseResult.fail(405,"销售不存在");
|
|
|
}
|
|
|
|
|
|
- // 判断是否绑定了销售
|
|
|
+ // 添加关系表数据
|
|
|
FsUserCompanyUser fsUserCompanyUser = getFsUserCompanyUser(param, fsUser);
|
|
|
QueryWrapper<FsUserCompanyUser> queryWrapper = new QueryWrapper<FsUserCompanyUser>().eq("user_id", param.getUserId()).eq("company_user_id", param.getCompanyUserId());
|
|
|
Integer i = fsUserCompanyUserMapper.selectCount(queryWrapper);
|
|
|
@@ -922,10 +927,10 @@ public class FsUserServiceImpl implements IFsUserService
|
|
|
companyTagUserMapper.insertCompanyTagUser(companyTagUser);
|
|
|
}
|
|
|
|
|
|
- // 如果是重粉，直接打上重粉的标签
|
|
|
- if(1 == fsUserCompanyUser.getIsRepeatFans()){
|
|
|
- this.setRepeatFansTag(param);
|
|
|
- }
|
|
|
+// // 如果是重粉，直接打上重粉的标签
|
|
|
+// if(1 == fsUserCompanyUser.getIsRepeatFans()){
|
|
|
+// this.setRepeatFansTag(param);
|
|
|
+// }
|
|
|
|
|
|
//如果是设置了需要进入小黑屋，则需要返回提示，否则正常返回
|
|
|
if(isDefaultBlack == 1){
|
