Browse Source

Merge branch 'test2' into test

# Conflicts:
#	src/main/java/com/goafanti/common/task/ReleaseUserTask.java
anderx 1 year ago
parent
commit
6c97038769
1 changed files with 8 additions and 7 deletions
  1. 8 7
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java

+ 8 - 7
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -72,13 +72,14 @@ public class ReleaseUserTask {
 		try {
 			List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");
 			pushUserDays(userList);
-//			Thread.sleep(2000);
-//			updateUser(userList);
-//			Thread.sleep(2000);
-//			pushRestrictProject(userList);
+			Thread.sleep(2000);
+			updateUser(userList);
+			Thread.sleep(2000);
+			pushRestrictProject(userList);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}
+
 	}
 
 	/**
@@ -189,9 +190,8 @@ public class ReleaseUserTask {
 		List<Notice> ln = new ArrayList<>();
 		List<userDaysBo> userChannelList = new ArrayList<userDaysBo>();
 		for (User u : userList) {
-			String uid=u.getId();
-			if (StringUtils.isNotBlank(uid)&&!AFTConstants.CAOJIN_AID.equals(uid)) {
-				List<userDaysBo> userTmpList  = customerService.selectReleaseUserDays(uid);
+			if (StringUtils.isNotBlank(u.getId())&&AFTConstants.CAOJIN_AID.equals(u.getId())) {
+				List<userDaysBo> userTmpList  = customerService.selectReleaseUserDays(u.getId());
 				for (userDaysBo ub : userTmpList) {
 					String str=null;
 					if (ub.getChannel() == 0) {
@@ -238,6 +238,7 @@ public class ReleaseUserTask {
 					System.out.println(u.getId());
 					if (StringUtils.isNotBlank(u.getId())&&!AFTConstants.CAOJIN_AID.equals(u.getId())) {
 						// 获取30天释放 释放以锁定表与user_mid最后跟进取时间
+
 						List<LockingReleaseBo>  userTmpList = customerService.selectWaitReleaseCustomer(u.getId());
 						customerService.pushReleaseLog(userTmpList, 0);
 						addUserNotice(userTmpList);