feat: 注册逻辑调整-已绑定销售的不允许再注册

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

@@ -1014,22 +1014,23 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
         }
 
-        // 判断是否重粉，添加关系表数据
-        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);
-        if(i == 0) {
-            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
-        }
-
-        // 如果重粉需要打上重粉标签
-        if(1 == fsUserCompanyUser.getIsRepeatFans()){
-            FsUserCourseBeMemberParam fsUserCourseBeMemberParam = new FsUserCourseBeMemberParam();
-            fsUserCourseBeMemberParam.setUserId(param.getUserId());
-            fsUserCourseBeMemberParam.setCompanyId(param.getCompanyId());
-            fsUserCourseBeMemberParam.setCompanyUserId(param.getCompanyUserId());
-            fsUserService.setRepeatFansTag(fsUserCourseBeMemberParam);
-        }
+//        // 判断是否重粉，添加关系表数据
+        // 逻辑调整：如果会员已经绑定了销售，直接提示，不添加重粉数据了-2025年6月16日14点58分
+//        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);
+//        if(i == 0) {
+//            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
+//        }
+
+//        // 如果重粉需要打上重粉标签
+//        if(1 == fsUserCompanyUser.getIsRepeatFans()){
+//            FsUserCourseBeMemberParam fsUserCourseBeMemberParam = new FsUserCourseBeMemberParam();
+//            fsUserCourseBeMemberParam.setUserId(param.getUserId());
+//            fsUserCourseBeMemberParam.setCompanyId(param.getCompanyId());
+//            fsUserCourseBeMemberParam.setCompanyUserId(param.getCompanyUserId());
+//            fsUserService.setRepeatFansTag(fsUserCourseBeMemberParam);
+//        }
         return ResponseResult.ok(Boolean.TRUE);
     }
 

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

@@ -840,6 +840,11 @@ 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)){
@@ -847,12 +852,12 @@ public class FsUserServiceImpl implements IFsUserService
         }
 
         // 判断是否绑定了销售
-        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);
-        if(i == 0) {
-            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
-        }
+//        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);
+//        if(i == 0) {
+//            fsUserCompanyUserMapper.insertFsUserCompanyUser(fsUserCompanyUser);
+//        }
 
         // 关联销售
         if(fsUser.getCompanyUserId() == null) {
@@ -887,10 +892,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){

fs-user-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -164,6 +164,10 @@ public class WxCompanyUserController extends AppBaseController {
                     userMap.setNickname(param.getNickname() != null ? param.getNickname() : "微信用户");
                     userMap.setAvatar(param.getAvatar() != null ? param.getAvatar() : null);
                     userMap.setPhone(phoneNoInfo.getPhoneNumber());
+                    // 逻辑调整：如果会员已经绑定了销售，直接提示，不让注册-2025年6月16日14点53分
+                    if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())){
+                        return R.error(406, "该用户已成为其他销售会员");
+                    }
                     if(companyUser != null && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
                         user.setCompanyId(param.getCompanyId());
                         user.setCompanyUserId(param.getCompanyUserId());

fs-user-app/src/main/java/com/fs/app/controller/WxH5MpController.java

@@ -36,7 +36,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-@Api("会员-h5-微信相关接口")
+@Api("会员-h5-微信相关接口（后面不需要这个接口了，再删除））")
 @RestController
 @RequestMapping("/app/wx/h5/mp")
 @Slf4j