|
|
@@ -69,6 +69,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
private Integer USER_CHANNEL_DAYS= null;
|
|
|
@Value(value = "${user.receive.max}")
|
|
|
private Integer USER_RECEIVE_MAX = null;
|
|
|
+
|
|
|
+ @Value(value = "${yxzj_max}")
|
|
|
+ private Integer YXZJ_MAX = null;
|
|
|
+ @Value(value = "${yxy_max}")
|
|
|
+ private Integer YXY_MAX = null;
|
|
|
+ @Value(value = "${yxjl_max}")
|
|
|
+ private Integer YXJL_MAX = null;
|
|
|
+
|
|
|
@Resource
|
|
|
private UserFollowMapper userFollowMapper;
|
|
|
@Resource
|
|
|
@@ -1200,6 +1208,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
uList = Arrays.asList(uid.split(","));
|
|
|
}
|
|
|
user.setId(uid);
|
|
|
+ user.setTransferTime(now);
|
|
|
int flag = 0;
|
|
|
//领取
|
|
|
if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
|
|
|
@@ -1207,7 +1216,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
|
|
|
user.setInformationMaintainer(TokenManager.getAdminId());
|
|
|
user.setSource(2);// 客户来源设置为领取
|
|
|
- user.setTransferTime(now);
|
|
|
flag = addUserLock(uid, TokenManager.getAdminId(), now, uList); // 指定用户锁定客户
|
|
|
addUserTransferLog(uid, TokenManager.getAdminId(), null,1, null, now, uList);
|
|
|
updateUserMid(aid,uid,0,null);
|
|
|
@@ -2185,13 +2193,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
List<String > roles=adminMapper.getAdminRoleListByAid(aid);
|
|
|
for (String role : roles) {
|
|
|
if (role.equals(AFTConstants.SALESMAN_DIRECTOR)){
|
|
|
- y = 800;
|
|
|
+ y = YXZJ_MAX;
|
|
|
break;
|
|
|
} else if (role.equals(AFTConstants.SALESMAN_MANAGER)){
|
|
|
- y = 200;
|
|
|
+ y = YXJL_MAX;
|
|
|
break;
|
|
|
} else if (role.equals(AFTConstants.SALESMAN)){
|
|
|
- y = 100;
|
|
|
+ y = YXY_MAX;
|
|
|
break;
|
|
|
}
|
|
|
}
|