|
|
@@ -285,6 +285,7 @@ public class ReleaseUserTask {
|
|
|
Date releaseTime = new Date();
|
|
|
try {
|
|
|
List<LockingReleaseBo> lockUserList = new ArrayList<>();
|
|
|
+ List<LockingReleaseBo> lockSignList = new ArrayList<>();
|
|
|
if (userList != null && !userList.isEmpty()) {
|
|
|
for (User u : userList) {
|
|
|
System.out.println(u.getId());
|
|
|
@@ -300,14 +301,24 @@ public class ReleaseUserTask {
|
|
|
List<LockingReleaseBo> users1 = userService.selectSignReleaseUser(u.getId());
|
|
|
customerService.pushReleaseLog(users1);
|
|
|
addUserNotice(users1);
|
|
|
- if (!users1.isEmpty()){
|
|
|
- lockUserList.addAll(users1);
|
|
|
- }
|
|
|
+ lockSignList.addAll(users1);
|
|
|
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //签单客户要单独处理,没有锁,直接释放
|
|
|
List<LockingReleaseBo> newList = new ArrayList<LockingReleaseBo>();
|
|
|
+ if (!lockSignList.isEmpty()) {
|
|
|
+ for (int i = 0; i < lockSignList.size(); i++) {
|
|
|
+ newList.add(lockSignList.get(i));
|
|
|
+ if (pointsDataLimit == newList.size() || i == lockUserList.size() - 1) {
|
|
|
+ customerService.updateUserShareType(newList);
|
|
|
+ newList.clear();
|
|
|
+ Thread.sleep(2000);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
//处理私有客户
|
|
|
if (!lockUserList.isEmpty()) {
|
|
|
for (int i = 0; i < lockUserList.size(); i++) {
|