zyp

fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -86,6 +86,11 @@ wx:
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
+      - appid: wxf1be66e6db43bd33   #中康智慧坊  郭明顺
+        secret: 488ad9e9729a18673b1d928f3d1976b0
+        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
+        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+        msgDataFormat: JSON
 
 
 

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

@@ -103,15 +103,17 @@ public class WxH5MpController {
             // 处理用户信息
             FsUser user = processUserInfo(wxMpUser, company,companyUser);
 
-            // 处理用户与公司的关系
-            processUserCompanyRelationship(user, param, companyUser, company);
-
             // 检查用户是否已绑定其他销售
             FsUserCompanyUser 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);
+
+
+
             // 生成token并返回结果
             return generateLoginResult(user);
         } catch (WxErrorException e) {
@@ -141,8 +143,8 @@ public class WxH5MpController {
             newUser.setAvatar(wxMpUser.getHeadImgUrl());
             newUser.setStatus(1);
             newUser.setMpOpenId(wxMpUser.getOpenid());
-            newUser.setCompanyId(company.getCompanyId());
-            newUser.setCompanyUserId(companyUser.getUserId());
+//            newUser.setCompanyId(company.getCompanyId());
+//            newUser.setCompanyUserId(companyUser.getUserId());
             newUser.setUnionId(wxMpUser.getUnionId());
             newUser.setCreateTime(new Date());
             newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);