|
@@ -185,6 +185,7 @@ public class ReleaseUserTask {
|
|
|
private void pushUserDays(List<User> userList ) throws InterruptedException {
|
|
private void pushUserDays(List<User> userList ) throws InterruptedException {
|
|
|
LoggerUtils.debug(getClass(), "==============客户提醒开始============");
|
|
LoggerUtils.debug(getClass(), "==============客户提醒开始============");
|
|
|
List<Notice> ln = new ArrayList<>();
|
|
List<Notice> ln = new ArrayList<>();
|
|
|
|
|
+ List<userDaysBo> userChannelList = new ArrayList<userDaysBo>();
|
|
|
for (User u : userList) {
|
|
for (User u : userList) {
|
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
|
List<userDaysBo> userTmpList = customerService.selectReleaseUserDays(u.getId());
|
|
List<userDaysBo> userTmpList = customerService.selectReleaseUserDays(u.getId());
|
|
@@ -192,9 +193,10 @@ public class ReleaseUserTask {
|
|
|
String str=null;
|
|
String str=null;
|
|
|
if (ub.getChannel() == 0) {
|
|
if (ub.getChannel() == 0) {
|
|
|
String shareType="";
|
|
String shareType="";
|
|
|
- if(ub.getNewChannel()==0)shareType="私有";
|
|
|
|
|
|
|
+ if(ub.getNewChannel()==0&&ub.getType()==0)shareType="私有";
|
|
|
|
|
+ else if(ub.getNewChannel()==0&&ub.getType()==2)shareType="签单";
|
|
|
else if(ub.getNewChannel()==1)shareType="渠道";
|
|
else if(ub.getNewChannel()==1)shareType="渠道";
|
|
|
- str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时%s!", shareType, ub.getName(),ub.getType()==0?"跟进":"签单");
|
|
|
|
|
|
|
+ str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时%s!", shareType, ub.getName(),"跟进");
|
|
|
}else {
|
|
}else {
|
|
|
str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时签单!", "外联", ub.getName());
|
|
str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时签单!", "外联", ub.getName());
|
|
|
}
|
|
}
|
|
@@ -202,10 +204,8 @@ public class ReleaseUserTask {
|
|
|
NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode(), str,ub.getUid()));
|
|
NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode(), str,ub.getUid()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- //查询15天未跟进,私有跟释放前15天重复,去除
|
|
|
|
|
- List<userDaysBo> userChannelList = new ArrayList<userDaysBo>();
|
|
|
|
|
- for (User u : userList) {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ //查询15天未跟进,私有跟释放前15天重复,去除
|
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
|
userChannelList = customerService.selectChannelNotFollow(u.getId());
|
|
userChannelList = customerService.selectChannelNotFollow(u.getId());
|
|
|
}
|
|
}
|
|
@@ -365,7 +365,8 @@ public class ReleaseUserTask {
|
|
|
if (!userTmpList.isEmpty()) {
|
|
if (!userTmpList.isEmpty()) {
|
|
|
for (LockingReleaseBo u : userTmpList) {
|
|
for (LockingReleaseBo u : userTmpList) {
|
|
|
String shareType="";
|
|
String shareType="";
|
|
|
- if(u.getNewChannel()==0)shareType="私有";
|
|
|
|
|
|
|
+ if(u.getNewChannel()==0&&u.getShareType()==0)shareType="私有";
|
|
|
|
|
+ else if(u.getNewChannel()==0&&u.getShareType()==2)shareType="签单";
|
|
|
else if(u.getNewChannel()==1)shareType="渠道";
|
|
else if(u.getNewChannel()==1)shareType="渠道";
|
|
|
nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
|
|
nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
|
|
|
NoticeStatus.CUSTOMER_LOSE30.getCode(),
|
|
NoticeStatus.CUSTOMER_LOSE30.getCode(),
|