修改公众号授权接口，去除销售id和销售公司id

fs-user-app/src/main/java/com/fs/app/controller/store/WxH5MpScrmController.java

@@ -79,17 +79,17 @@ public class WxH5MpScrmController {
             return R.error("code不存在");
         }
 
-        // 公司状态校验
-        Company company = companyService.selectCompanyById(param.getCompanyId());
-        if (company == null || company.getStatus() == 0) {
-            return R.error("注册失败团队已停用，或不存在！");
-        }
-
-        // 客服状态校验
-        CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());
-        if (companyUser == null || "1".equals(companyUser.getStatus())) {
-            return R.error("注册失败客服已停用，或不存在！");
-        }
+//        // 公司状态校验
+//        Company company = companyService.selectCompanyById(param.getCompanyId());
+//        if (company == null || company.getStatus() == 0) {
+//            return R.error("注册失败团队已停用，或不存在！");
+//        }
+//
+//        // 客服状态校验
+//        CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());
+//        if (companyUser == null || "1".equals(companyUser.getStatus())) {
+//            return R.error("注册失败客服已停用，或不存在！");
+//        }
 
         try {
             // 获取微信用户信息
@@ -98,13 +98,14 @@ public class WxH5MpScrmController {
 
 
             // 处理用户信息
-            FsUserScrm user = processUserInfo(wxMpUser, company,companyUser,param);
+            FsUserScrm user = processUserInfo(wxMpUser,param);
+            //FsUserScrm user = processUserInfo(wxMpUser, company,companyUser,param);
 
             // 检查用户是否已绑定其他销售
-            FsUserCompanyUserScrm userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(user.getUserId(), param.getProjectId());
-            if (Objects.nonNull(userCompanyUser) && !param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
-                return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
-            }
+//            FsUserCompanyUserScrm userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(user.getUserId(), param.getProjectId());
+//            if (Objects.nonNull(userCompanyUser) && !param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
+//                return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
+//            }
 
 //            // 处理用户与公司的关系
 //            processUserCompanyRelationship(user, param, companyUser, company);
@@ -130,7 +131,7 @@ public class WxH5MpScrmController {
         return R.ok(result);
     }
 
-    private FsUserScrm processUserInfo(WxOAuth2UserInfo wxMpUser, Company company,CompanyUser companyUser,FsUserLoginByMpParam param) {
+    private FsUserScrm processUserInfo(WxOAuth2UserInfo wxMpUser,FsUserLoginByMpParam param) {
         FsUserScrm user = userService.selectFsUserByUnionId(wxMpUser.getUnionId());
 
         if (user != null) {
@@ -155,7 +156,8 @@ public class WxH5MpScrmController {
 //            newUser.setCompanyUserId(companyUser.getUserId());
             newUser.setUnionId(wxMpUser.getUnionId());
             newUser.setCreateTime(new Date());
-            newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);
+            //newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);
+            newUser.setStatus(1);
             userService.insertFsUser(newUser);
 
             return newUser;

fs-user-app/src/main/java/com/fs/app/param/FsUserLoginByMpParam.java

@@ -20,11 +20,11 @@ public class FsUserLoginByMpParam implements Serializable {
 
     private Long videoId;
 
-    @NotNull(message = "公司id不能为空")
+    //@NotNull(message = "公司id不能为空")
     @ApiModelProperty(value = "公司id")
     private Long companyId;
 
-    @NotNull(message = "销售id不能为空")
+    //@NotNull(message = "销售id不能为空")
     @ApiModelProperty(value = "销售id")
     private Long companyUserId;