|
|
@@ -509,10 +509,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
//更新业务表
|
|
|
userBusiness.setId(ub.getBusinessId());
|
|
|
if (us.getFollowSituation()==5) {//如果已签合同,则不允许变更
|
|
|
- /*if (ub.getFollowSituation()!=5&&checkCustomerInformation(uid)) {
|
|
|
- throw new BusinessException(new Error("","请到客户资料-客户资料维护模块完善您的客户信息!"));
|
|
|
- }*/
|
|
|
- if (ub.getCustomerStatus()!=us.getCustomerStatus()|| ub.getFollowSituation()!=5) {
|
|
|
+ if (ub.getCustomerStatus()!=us.getCustomerStatus()&& ub.getFollowSituation()!=5) {
|
|
|
throw new BusinessException(new Error(ErrorConstants.BUSINESS_ALREADY_LOCKED,""));
|
|
|
}
|
|
|
}
|
|
|
@@ -941,7 +938,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
|
|
|
user.setInformationMaintainer(TokenManager.getAdminId());
|
|
|
user.setSource(2);//客户来源设置为领取
|
|
|
- user.setTransferTime(now);
|
|
|
+// 转换不重置时间
|
|
|
+// user.setTransferTime(now);
|
|
|
flag = addUserLock(uid,TokenManager.getAdminId(),0,null,now); //指定用户锁定客户
|
|
|
if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
|
|
|
if(userMapper.UserReceiveCount(TokenManager.getAdminId())>AFTConstants.USER_RCEIVE_MAX)
|
|
|
@@ -950,7 +948,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
|
|
|
user.setAid(String.valueOf(params[0]));
|
|
|
user.setSource(3);//客户来源设置为转交
|
|
|
- user.setTransferTime(now);
|
|
|
+// 转换不重置时间
|
|
|
+// user.setTransferTime(now);
|
|
|
//查询这个客户是否是登陆人的客户
|
|
|
if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
|
|
|
flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户
|