|
|
@@ -33,7 +33,6 @@ import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
@Component
|
|
|
@@ -234,7 +233,7 @@ public class ReleaseUserTask {
|
|
|
Date releaseTime = new Date();
|
|
|
try {
|
|
|
List<LockingReleaseBo> lockUserList = new ArrayList<>();
|
|
|
- List<LockingReleaseBo> lockUserList2 = new ArrayList<>();
|
|
|
+ List<LockingReleaseBo> users=new ArrayList<>();
|
|
|
if (userList != null && !userList.isEmpty()) {
|
|
|
for (User u : userList) {
|
|
|
System.out.println(u.getId());
|
|
|
@@ -244,16 +243,15 @@ public class ReleaseUserTask {
|
|
|
customerService.pushReleaseLog(userTmpList);
|
|
|
addUserNotice(userTmpList);
|
|
|
if (!userTmpList.isEmpty()) {
|
|
|
- //30天私有和270天签单业务释放不改变
|
|
|
- List<LockingReleaseBo> collect = userTmpList.stream().filter(e ->
|
|
|
- (e.getShareType() == 0&& e.getType()==0)||e.getType()==1
|
|
|
- ).collect(Collectors.toList());
|
|
|
- lockUserList.addAll(collect);
|
|
|
- //30天签单单独只释放签签单
|
|
|
- List<LockingReleaseBo> collect2 = userTmpList.stream().filter(e ->
|
|
|
- e.getShareType() == 2&& e.getType()==0).collect(Collectors.toList());
|
|
|
- lockUserList2.addAll(collect2);
|
|
|
+ lockUserList.addAll(userTmpList);
|
|
|
}
|
|
|
+ //获取需要释放的签单客户
|
|
|
+ List<LockingReleaseBo> users1 = userService.selectSignReleaseUser(u.getId());
|
|
|
+ if (!users1.isEmpty()){
|
|
|
+ users.addAll(users1);
|
|
|
+ }
|
|
|
+ customerService.pushReleaseLog(users);
|
|
|
+ addUserNotice(users);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -270,11 +268,13 @@ public class ReleaseUserTask {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- if (!lockUserList2.isEmpty()) {
|
|
|
- for (int i = 0; i < lockUserList2.size(); i++) {
|
|
|
- newList.add(lockUserList2.get(i));
|
|
|
- System.out.println(lockUserList2.get(i).getUserName());
|
|
|
- if (pointsDataLimit == newList.size() || i == lockUserList.size() - 1) {
|
|
|
+
|
|
|
+ //新增客户丢失
|
|
|
+ if (!users.isEmpty()) {
|
|
|
+ List<LockingReleaseBo> releaseList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < users.size(); i++) {
|
|
|
+ releaseList.add(users.get(i));
|
|
|
+ if (pointsDataLimit == releaseList.size() || i == users.size() - 1) {
|
|
|
userService.updateUserShareType(newList);
|
|
|
newList.clear();
|
|
|
Thread.sleep(2000);
|
|
|
@@ -299,6 +299,7 @@ public class ReleaseUserTask {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
private void pushSalesmanCount(List<LockingReleaseBo> aidList) {
|
|
|
for (LockingReleaseBo e : aidList) {
|
|
|
String dates= e.getLockTime();
|