Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

gitadmin лет назад: 3
Родитель
Сommit
b839242cf5

+ 9 - 8
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -324,6 +324,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		user.setCreateTime(now);
 		user.setTransferTime(now);
 		user.setUpdateTime(now);
+		user.setSignBills(0);
+		user.setNewChannel(0);
 		if(StringUtils.isNotBlank(in.getIntroduction()))user.setIntroduction(in.getIntroduction());
 		user.setMobile(in.getContactMobile());
 		user.setPassword(AFTConstants.INITIALPASSWORD);
@@ -354,6 +356,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		} else if (in.getType() == UserType.ORGANIZATION.getCode()) {
 			if (userMapper.checkUser("", in.getName(), "", in.getType(), null, null).size() > 0)
 				throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, in.getName(), ""));
+			UserMid um=new UserMid();
+			um.setAid(user.getAid());
+			um.setUid(uid);
+			um.setChannelType(in.getChannelType());
+			userMidMapper.insertSelective(um);
 			// 创建企业认证信息
 			OrganizationIdentity oi = new OrganizationIdentity();
 			oi.setUnitName(in.getName());
@@ -377,16 +384,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 //			oi.setIndustry(in.getIndustry());
 			organizationIdentityMapper.insert(oi);
 		}
-		userMapper.insert(user);
+		userMapper.insertSelective(user);
 		UserNames un=new UserNames();
 		un.setUid(user.getId());
 		un.setName(user.getNickname());
 		userNamesMapper.insertSelective(un);
-		UserMid um=new UserMid();
-		um.setAid(user.getAid());
-		um.setUid(uid);
-		um.setChannelType(in.getChannelType());
-		userMidMapper.insertSelective(um);
+
 		// 新增企业联系人
 		OrganizationContactBook cob = new OrganizationContactBook();
 		cob.setAid(TokenManager.getAdminId());
@@ -2134,8 +2137,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			if (user.getNewChannel()==1){
 				return false;
 			}
-		}else {
-
 		}
 		List<String > roles=adminMapper.getAdminRoleListByAid(aid);
 		for (String role : roles) {