|
|
@@ -1002,7 +1002,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int updateByOperatorType(String uid,String oldAid, String operatorType,Object... params) {
|
|
|
+ public int updateByOperatorType(String uid,String oldAid, Integer operatorType,Object... params) {
|
|
|
User user = new User();
|
|
|
Date now = new Date();
|
|
|
//是否多个客户
|
|
|
@@ -1016,7 +1016,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
user.setId(uid);
|
|
|
int flag = 0;
|
|
|
- if(operatorType.equals(AFTConstants.USER_RECEIVE)){
|
|
|
+ if(AFTConstants.USER_RECEIVE.equals(operatorType)){
|
|
|
if(userMapper.UserReceiveCount(TokenManager.getAdminId())>=USER_RECEIVE_MAX)
|
|
|
throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+USER_RECEIVE_MAX,""));
|
|
|
user.setAid(TokenManager.getAdminId());
|
|
|
@@ -1028,12 +1028,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
|
|
|
//取消客户领取时把联系人一并转移
|
|
|
//organizationContactBookMapper.updateAdmin(uid,TokenManager.getAdminId());
|
|
|
- }else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
|
|
|
+ }else if(AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)){
|
|
|
if(!isUs) {
|
|
|
user.setAid(String.valueOf(params[0]));
|
|
|
user.setSource(3);//客户来源设置为转交
|
|
|
-// 转换不重置时间
|
|
|
-// user.setTransferTime(now);
|
|
|
+ if (AFTConstants.SIGN_USER_TRANSFER_TO_OTHER==operatorType) {
|
|
|
+ user.setShareType(2);
|
|
|
+ }
|
|
|
//查询这个客户是否是登陆人的客户
|
|
|
if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
|
|
|
flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户
|
|
|
@@ -1049,9 +1050,33 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_TRANSFER_FAIL,""));
|
|
|
addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0,isUs);
|
|
|
}
|
|
|
+ }else if(AFTConstants.SIGN_USER_TRANSFER_TO_OTHER.equals(operatorType)){
|
|
|
+ if(!isUs) {
|
|
|
+ user.setAid(String.valueOf(params[0]));
|
|
|
+ user.setSource(3);//客户来源设置为转交
|
|
|
+ if (AFTConstants.SIGN_USER_TRANSFER_TO_OTHER==operatorType) {
|
|
|
+ user.setShareType(2);
|
|
|
+ }
|
|
|
+ //查询这个客户是否是登陆人的客户
|
|
|
+ if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
|
|
|
+ addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0,isUs);
|
|
|
+ }else {
|
|
|
+ for (String us : uList) {
|
|
|
+ if(userMapper.getAidAndUser(us,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
|
|
|
+ }
|
|
|
+ addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0,isUs);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ if (isUs) {
|
|
|
+ if (AFTConstants.SIGN_USER_TRANSFER_TO_OTHER==operatorType) {
|
|
|
+ userMapper.updateList(String.valueOf(params[0]),null,3,null,2,uList);
|
|
|
+ } else {
|
|
|
+ userMapper.updateList(String.valueOf(params[0]),null,3,null,null,uList);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ userMapper.updateByPrimaryKeySelective(user);
|
|
|
}
|
|
|
- if (isUs) userMapper.updateList(String.valueOf(params[0]),null,3,null,null,uList);
|
|
|
- else userMapper.updateByPrimaryKeySelective(user);
|
|
|
return 1;
|
|
|
}
|
|
|
|