Bladeren bron

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 2 maanden geleden
bovenliggende
commit
9ba5178d49

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

@@ -63,18 +63,18 @@ public class ReleaseUserTask {
 	 * 客户释放
 	 *
 	 */
-//	@Scheduled(cron = "0 48 11  * * ?")
+//	@Scheduled(cron = "0 43 15  * * ?")
 //	@RequestMapping("/open/test")
 	@Scheduled(cron = "0 0 1  * * ?")
 	public void startTask() {
 		try {
 			List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");
 			pushUserDays(userList);
-			Thread.sleep(2000);
+			Thread.sleep(500);
 			updateUser(userList);
-			Thread.sleep(2000);
+			Thread.sleep(500);
 			pushRestrictProject(userList);
-			Thread.sleep(2000);
+			Thread.sleep(500);
 			pushReleaseClueUser(userList);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
@@ -237,6 +237,11 @@ public class ReleaseUserTask {
 		}
 	}
 
+	/**
+	 * 客户提醒
+	 * @param userList
+	 * @throws InterruptedException
+	 */
 	private void pushUserDays(List<User> userList ) throws InterruptedException {
 		LoggerUtils.debug(getClass(), "==============客户提醒开始============");
 		List<Notice> ln = new ArrayList<>();
@@ -302,7 +307,6 @@ public class ReleaseUserTask {
 						customerService.pushReleaseLog(users1);
 						addUserNotice(users1);
 						lockSignList.addAll(users1);
-
 					}
 				}
 			}

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

@@ -2581,7 +2581,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		List<UserTransferLog> list3 = new ArrayList<UserTransferLog>();
 		if (!list.isEmpty()) {
 			for (int i = 0; i < list.size(); i++) {
-
 				newList.add(list.get(i));
 				if (50 == newList.size() || i == list.size() - 1) {
 					if (!newList.isEmpty()) {
@@ -2591,10 +2590,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 							UserTransferLog utl = new UserTransferLog();
 							utl.setAid(lrb.getAid());
 							utl.setCreateTime(date);
-							if (type == 0)
+							if (type == 0){
 								utl.setType(4);
-							else if (type == 1)
+							}else if (type == 1){
 								utl.setType(5);
+							}
 							utl.setUid(lrb.getUid());
 							list3.add(utl);
 						}

+ 6 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1201,8 +1201,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}else if (examineType==1){
 			//通知公出人切换成公出人审核人
 			if (status==2){
-			List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
-			adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
+				if (use.getPublicType()!=1){
+					throw new BusinessException("当前状态不是客户归属人审核,请刷新页面");
+				}
+				List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
+				adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
+
 				//审核通过
 				str=str.append("同意公出我的企业,").append(remarks);
 				content=content.append("已通过审核,请尽快审核。");