|
@@ -2081,7 +2081,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
@Override
|
|
@Override
|
|
|
public Object pushChannelDeliver(List<String> uids, String receiveId, String remarks, Integer type) {
|
|
public Object pushChannelDeliver(List<String> uids, String receiveId, String remarks, Integer type) {
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
|
- int i = userMapper.updatechannelCustomerDeliver(uids, receiveId);
|
|
|
|
|
|
|
+ Integer i = userMapper.updatechannelCustomerDeliver(uids, receiveId);
|
|
|
|
|
+ Integer status=null;
|
|
|
|
|
+ String role=userMapper.checkRoleMax(receiveId);
|
|
|
|
|
+ if (role.equals(AFTConstants.SALESMAN_MANAGER)) {
|
|
|
|
|
+ status=1;
|
|
|
|
|
+ }else {
|
|
|
|
|
+ status=2;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (i > 0) {
|
|
if (i > 0) {
|
|
|
List<UserTransferLog> l = new ArrayList<UserTransferLog>();
|
|
List<UserTransferLog> l = new ArrayList<UserTransferLog>();
|
|
|
for (String string : uids) {
|
|
for (String string : uids) {
|
|
@@ -2109,9 +2117,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
userLockReleaseMapper.updateChannelList(uids,receiveId);
|
|
userLockReleaseMapper.updateChannelList(uids,receiveId);
|
|
|
}
|
|
}
|
|
|
if(type==0) {
|
|
if(type==0) {
|
|
|
- userChannelMapper.updateByuids(uids, type, date,receiveId);
|
|
|
|
|
|
|
+ userChannelMapper.updateByuids(uids, type, date,receiveId,status);
|
|
|
}else {
|
|
}else {
|
|
|
- userChannelMapper.updateByuids(uids, type, date,null);
|
|
|
|
|
|
|
+ userChannelMapper.updateByuids(uids, type, date,null,status);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
organizationContactBookMapper.updateByUids(uids, receiveId);
|
|
organizationContactBookMapper.updateByUids(uids, receiveId);
|