Browse Source

[招商]adjust

release_toaliyun_real
Burce 6 years ago
parent
commit
d56bd8afde
2 changed files with 8 additions and 7 deletions
  1. +4
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java
  2. +4
    -5
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 4
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java View File

@@ -55,7 +55,8 @@ public class InvestSchedule {
//初始化时间条件 //初始化时间条件
Calendar start = Calendar.getInstance(); Calendar start = Calendar.getInstance();
Calendar end = Calendar.getInstance(); Calendar end = Calendar.getInstance();
end.add(Calendar.MONTH, 1);
//end.add(Calendar.MONTH, 1);
end.add(Calendar.DAY_OF_YEAR, 1); //测试
//查询满足条件 //查询满足条件
List<InvestTaskEntity> tasks = taskService.listByStatusAndTime(Arrays.asList(EnumTaskStatus.INTENTION, EnumTaskStatus.NEGOTIATING), start.getTime(), end.getTime()); List<InvestTaskEntity> tasks = taskService.listByStatusAndTime(Arrays.asList(EnumTaskStatus.INTENTION, EnumTaskStatus.NEGOTIATING), start.getTime(), end.getTime());
for (InvestTaskEntity task : tasks) { for (InvestTaskEntity task : tasks) {
@@ -87,7 +88,8 @@ public class InvestSchedule {


//初始化时间条件 //初始化时间条件
Calendar start = Calendar.getInstance(); 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<InvestFollowRecordEntity> follows = followRecordService.listByTime(EnumFollowType.DEMAND, start.getTime()); List<InvestFollowRecordEntity> follows = followRecordService.listByTime(EnumFollowType.DEMAND, start.getTime());


+ 4
- 5
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java View File

@@ -41,7 +41,6 @@ import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
@@ -878,12 +877,12 @@ public class InvestBizServiceImpl implements InvestBizService {
int count = rentContractService.selectContractCountByShopId(contractQuery); int count = rentContractService.selectContractCountByShopId(contractQuery);
if (count > 0) { if (count > 0) {
investTaskEntity.setStatus(EnumTaskStatus.INTENTION); 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<Long, MallUserInfo> usersMap, InvestFollowRecordEntity item, private InvestFollowRecordVo buildFollowRecordItem(Map<Long, MallUserInfo> usersMap, InvestFollowRecordEntity item,


Loading…
Cancel
Save