diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 5d448b57b..b4b8496e7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -55,7 +55,8 @@ public class InvestSchedule { //初始化时间条件 Calendar start = Calendar.getInstance(); Calendar end = Calendar.getInstance(); - end.add(Calendar.MONTH, 1); + //end.add(Calendar.MONTH, 1); + end.add(Calendar.DAY_OF_YEAR, 1); //测试 //查询满足条件 List tasks = taskService.listByStatusAndTime(Arrays.asList(EnumTaskStatus.INTENTION, EnumTaskStatus.NEGOTIATING), start.getTime(), end.getTime()); for (InvestTaskEntity task : tasks) { @@ -87,7 +88,8 @@ public class InvestSchedule { //初始化时间条件 Calendar start = Calendar.getInstance(); - start.add(Calendar.DAY_OF_YEAR, 7); + //start.add(Calendar.DAY_OF_YEAR, 7); + start.add(Calendar.DAY_OF_YEAR, 1); //测试 //查询跟踪列表 List follows = followRecordService.listByTime(EnumFollowType.DEMAND, start.getTime()); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 9ee54ca31..4674112a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -41,7 +41,6 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -878,12 +877,12 @@ public class InvestBizServiceImpl implements InvestBizService { int count = rentContractService.selectContractCountByShopId(contractQuery); if (count > 0) { investTaskEntity.setStatus(EnumTaskStatus.INTENTION); - } else { - if (StringUtils.isNotBlank(investTaskEntity.getOwner())) { - investTaskEntity.setStatus(EnumTaskStatus.NEGOTIATING); - } } } + + if (StringUtils.isNotBlank(investTaskEntity.getOwner()) && Objects.equals(EnumTaskStatus.CREATED, investTaskEntity.getStatus())) { + investTaskEntity.setStatus(EnumTaskStatus.NEGOTIATING); + } } private InvestFollowRecordVo buildFollowRecordItem(Map usersMap, InvestFollowRecordEntity item,