Kaynağa Gözat

定时修改

anderx 1 yıl önce
ebeveyn
işleme
9d246a6e5c

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

@@ -187,7 +187,7 @@ public class ReleaseUserTask {
 		List<Notice> ln = new ArrayList<>();
 		List<userDaysBo> userChannelList = new ArrayList<userDaysBo>();
 		for (User u : userList) {
-			if (StringUtils.isNotBlank(u.getId())) {
+			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;
@@ -232,7 +232,7 @@ public class ReleaseUserTask {
 			List<LockingReleaseBo> lockUserList = new ArrayList<LockingReleaseBo>();
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
-					if (StringUtils.isNotBlank(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);

+ 3 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2163,10 +2163,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
             if (i == 0) {
                 diff1 = (int) ((l1 + AFTConstants.USER_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
                 diff2 = (int) ((l2 + AFTConstants.USER_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+				if (diff1 < 0)diff1 = 0;
+				if (diff2 < 0)diff2 = 0;
             } else if (i == 1) {
                 diff1 = (int) ((l1 + AFTConstants.PROJECT_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
 //                diff2 = (int) ((l2 + AFTConstants.PROJECT_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
-
+				if (diff1 < 0)diff1 = 0;
             }
             clo.setSurplusFollowTime(diff1 + "");
             clo.setSurplusSignTime(diff2 + "");