|
@@ -1243,6 +1243,20 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public int pushReceiveAsChannel(String uid) {
|
|
|
|
|
+ Date date = new Date();
|
|
|
|
|
+ User u =new User();
|
|
|
|
|
+ String aid=TokenManager.getAdminId();
|
|
|
|
|
+ u.setId(uid);
|
|
|
|
|
+ u.setChannel(0);
|
|
|
|
|
+ u.setShareType(0);
|
|
|
|
|
+ u.setNewChannel(1);
|
|
|
|
|
+ addUserLock(uid,aid, date, null); // 指定用户锁定客户
|
|
|
|
|
+ updateUserMid(aid,uid,0,null);
|
|
|
|
|
+ addUserTransferLog(uid, aid,null, 15, null, date, null);
|
|
|
|
|
+ return userMapper.updateByPrimaryKeySelective(u);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1273,7 +1287,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
private int addUserLock(String uid, String aid, Date lockTime, List<String> uList) {
|
|
private int addUserLock(String uid, String aid, Date lockTime, List<String> uList) {
|
|
|
- if (uList.isEmpty()) {
|
|
|
|
|
|
|
+ if (uList ==null|| uList.isEmpty()) {
|
|
|
UserLockRelease ulr = new UserLockRelease();
|
|
UserLockRelease ulr = new UserLockRelease();
|
|
|
ulr.setId(UUID.randomUUID().toString());
|
|
ulr.setId(UUID.randomUUID().toString());
|
|
|
ulr.setType(0);
|
|
ulr.setType(0);
|
|
@@ -1301,19 +1315,20 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
*
|
|
*
|
|
|
- * @param type 0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放 7转交签单客户
|
|
|
|
|
|
|
+ * @param type 类型 0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放 7转交签单客户 8渠道录入 9渠道客户总监分配 10 渠道客户经理分配 11渠道释放 12回收 13离职客户转交 14离职签单业务转交
|
|
|
|
|
+ * 15 领取为私有渠道
|
|
|
*/
|
|
*/
|
|
|
private void addUserTransferLog(String uid, String aid,String oldAid, Integer type, String pid,
|
|
private void addUserTransferLog(String uid, String aid,String oldAid, Integer type, String pid,
|
|
|
Date lockTime, List<String> uList) {
|
|
Date lockTime, List<String> uList) {
|
|
|
- if (uList.isEmpty()) {
|
|
|
|
|
|
|
+ if (uList ==null || uList.isEmpty()) {
|
|
|
UserTransferLog utl = new UserTransferLog();
|
|
UserTransferLog utl = new UserTransferLog();
|
|
|
- if (type == 0 || type == 1)
|
|
|
|
|
|
|
+ if (type == 0 || type == 1 ||type ==15)
|
|
|
utl.setAid(aid);
|
|
utl.setAid(aid);
|
|
|
else if (type == 2 || type == 3 || type == 7) {
|
|
else if (type == 2 || type == 3 || type == 7) {
|
|
|
utl.setAid(TokenManager.getAdminId());
|
|
utl.setAid(TokenManager.getAdminId());
|
|
|
utl.setTakeAid(aid);
|
|
utl.setTakeAid(aid);
|
|
|
|
|
+ if (type == 3) utl.setPid(pid);
|
|
|
}
|
|
}
|
|
|
- if (type == 3) utl.setPid(pid);
|
|
|
|
|
utl.setType(type);
|
|
utl.setType(type);
|
|
|
utl.setCreateTime(lockTime);
|
|
utl.setCreateTime(lockTime);
|
|
|
utl.setUid(uid);
|
|
utl.setUid(uid);
|