|
|
@@ -1196,8 +1196,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
user.setTransferTime(now);
|
|
|
flag = addUserLock(uid, TokenManager.getAdminId(), now, uList); // 指定用户锁定客户
|
|
|
addUserTransferLog(uid, TokenManager.getAdminId(), null,1, null, now, uList);
|
|
|
- if (flag <= 0)
|
|
|
- throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE, ""));
|
|
|
updateUserMid(aid,uid,0,null);
|
|
|
organizationContactBookMapper.updateAdmin(uid,aid);
|
|
|
//转交
|
|
|
@@ -1260,13 +1258,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public boolean receiveEveryDay(String uid) {
|
|
|
+ public Integer receiveEveryDay(String uid) {
|
|
|
if (uid !=null ){
|
|
|
User u=userMapper.selectByPrimaryKey(uid);
|
|
|
- if (u.getNewChannel()==1)return false;
|
|
|
+ if (u.getShareType()!=1)return -1;
|
|
|
+ if (u.getNewChannel()==1)return 0;
|
|
|
}
|
|
|
- if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return true;
|
|
|
- return false;
|
|
|
+ if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return -2;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
@Override
|