bugfix

src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -567,7 +567,8 @@ public class LoginApi {
         String nickName = authInvitationDto.getNickName();
         String avatarUrl = authInvitationDto.getAvatarUrl();
         String unionId = authInvitationDto.getUnionId();
-        return loginService.invitationCodeLogin(invitationCode, nickName, avatarUrl, unionId);
+        Integer organizeId = null == authInvitationDto.getOrganizeId() ? 0 : authInvitationDto.getOrganizeId();
+        return loginService.invitationCodeLogin(invitationCode, nickName, avatarUrl, unionId, organizeId);
     }
 
     /**

src/main/java/com/caimei365/user/model/dto/AuthInvitationDto.java

@@ -37,4 +37,6 @@ public class AuthInvitationDto implements Serializable {
      */
     @ApiModelProperty("微信unionId")
     private String unionId;
+
+    private Integer organizeId;
 }

src/main/java/com/caimei365/user/service/LoginService.java

@@ -182,7 +182,7 @@ public interface LoginService {
      * @param unionId        微信unionId
      * @return UserLoginVo
      */
-    ResponseJson<UserLoginVo> invitationCodeLogin(String invitationCode, String nickName, String avatarUrl, String unionId);
+    ResponseJson<UserLoginVo> invitationCodeLogin(String invitationCode, String nickName, String avatarUrl, String unionId, Integer organizeId);
 
     /**
      * 邀请码登录

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -548,48 +548,6 @@ public class ClubServiceImpl implements ClubService {
                         type = 1;
                     }
                 }
-/*
-                if (clubVo.getCityId() != null) {
-                    if (club.getCityId() != null) {
-                        if (!club.getCityId().equals(clubVo.getCityId())) {
-                            list.add("修改了详细地址");
-                        }
-                    } else {
-                        list.add("删除了详细地址");
-                    }
-                } else {
-                    if (club.getCityId() != null) {
-                        list.add("新增了详细地址");
-                    }
-                }
-
-                if (clubVo.getTownId() != null) {
-                    if (club.getTownId() != null) {
-                        if (!club.getTownId().equals(clubVo.getTownId())) {
-                            list.add("修改了详细地址");
-                        }
-                    } else {
-                        list.add("删除了详细地址");
-                    }
-                } else {
-                    if (club.getTownId() != null) {
-                        list.add("新增了详细地址");
-                    }
-                }
-
-                if (StringUtils.isNotBlank(clubVo.getAddress())) {
-                    if (StringUtils.isNotBlank(club.getAddress())) {
-                        if (!club.getAddress().equals(clubVo.getAddress())) {
-                            list.add("修改了详细地址");
-                        }
-                    } else {
-                        list.add("删除了详细地址");
-                    }
-                } else {
-                    if (StringUtils.isNotBlank(club.getAddress())) {
-                        list.add("新增了详细地址");
-                    }
-                }*/
 
                 if (StringUtils.isNotBlank(clubVo.getSocialCreditCode())) {
                     if (StringUtils.isNotBlank(club.getSocialCreditCode())) {
@@ -801,7 +759,7 @@ public class ClubServiceImpl implements ClubService {
             }
         }
         // 协销帮忙修改 取协销人员
-        if (club.getServiceProviderId() != 0) {
+        if (null != club.getServiceProviderId() && club.getServiceProviderId() != 0) {
             String spName = clubMapper.selSpName(club.getServiceProviderId());
             operationalLogsPo.setOperator(spName);
         }

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -1222,12 +1222,12 @@ public class LoginServiceImpl implements LoginService {
      * @return UserLoginVo
      */
     @Override
-    public ResponseJson<UserLoginVo> invitationCodeLogin(String invitationCode, String nickName, String avatarUrl, String unionId) {
+    public ResponseJson<UserLoginVo> invitationCodeLogin(String invitationCode, String nickName, String avatarUrl, String unionId,Integer organizeId) {
         // 参数校验
         if (StringUtils.isBlank(invitationCode)) {
             return ResponseJson.error("邀请码不能为空", null);
         }
-        UserLoginVo operation = loginMapper.getOperationUserByInvitationCode(invitationCode, 0);
+        UserLoginVo operation = loginMapper.getOperationUserByInvitationCode(invitationCode, organizeId);
         if (operation == null) {
             return ResponseJson.error("邀请码错误", null);
         }

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -20,16 +20,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -207,8 +208,6 @@ public class RegisterServiceImpl implements RegisterService {
         user.setSource(clubRegisterDto.getSource());
         // 用户类型，供应商1，会员机构3,普通机构4
         user.setRegisterUserTypeId(4);
-        // 采美默认组织机构0
-        user.setOrganizeId(0);
         // 用户名
         user.setName(clubRegisterDto.getUserName());
         user.setUserName(clubRegisterDto.getUserName());
@@ -232,6 +231,12 @@ public class RegisterServiceImpl implements RegisterService {
         user.setUserBeans(1000);
         // 友站Id
         user.setPartnerId(clubRegisterDto.getPartnerId());
+        // 采美0 二手5
+        Integer organize = 0;
+        if (null != clubRegisterDto.getOrganizeId()) {
+            organize = clubRegisterDto.getOrganizeId();
+        }
+        user.setOrganizeId(organize);
         /*
             保存数据库 user
          */