suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增逾期作废状态

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-24 10:30:11 +08:00
parent a655ddefb0
commit 4504c58b7e
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java
View File

@@ -13,6 +13,7 @@ public enum FollowTaskStatusEnum {
OVERDUE(2, "已逾期"), OVERDUE(2, "已逾期"),
CANCELLED(3, "作废"), CANCELLED(3, "作废"),
OVERDUE_FINISH(4, "逾期完成"), OVERDUE_FINISH(4, "逾期完成"),
OVERDUE_CANCELLED(5, "逾期作废"),
; ;
//任务状态:0:待完成、1:已完成、2:已逾期、3:作废 //任务状态:0:待完成、1:已完成、2:已逾期、3:作废

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
View File

@@ -99,10 +99,10 @@ public class HyFollowTaskDAO {
* @param followTaskId * @param followTaskId
* @return * @return
*/ */
public Integer cancelFollowTask(Long followTaskId){ public Integer cancelFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){
HyFollowTaskDO update = new HyFollowTaskDO(); HyFollowTaskDO update = new HyFollowTaskDO();
update.setId(followTaskId); update.setId(followTaskId);
update.setTaskStatus(FollowTaskStatusEnum.CANCELLED.getCode()); update.setTaskStatus(followTaskStatus.getCode());
return updateFollowTask(update); return updateFollowTask(update);
} }

2
coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
View File

@@ -40,7 +40,7 @@ public class HyFollowTaskDO implements Serializable {
@ApiModelProperty("计划沟通内容") @ApiModelProperty("计划沟通内容")
private String communicationContent; private String communicationContent;
@ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废") @ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废、4逾期完成、5逾期作废")
private Integer taskStatus; private Integer taskStatus;
@ApiModelProperty("任务截止时间") @ApiModelProperty("任务截止时间")

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
View File

@@ -149,7 +149,7 @@ public class FollowTaskServiceImpl implements FollowTaskService {
@Override @Override
public Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) { public Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) {
HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId()); HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId());
if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())){ if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())|| FollowTaskStatusEnum.OVERDUE_CANCELLED.getCode().equals(followTask.getTaskStatus())){
throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
} }
if(Objects.nonNull(request.getDeadline()) && request.getDeadline().getTime() < System.currentTimeMillis()){ if(Objects.nonNull(request.getDeadline()) && request.getDeadline().getTime() < System.currentTimeMillis()){
@@ -181,11 +181,15 @@ public class FollowTaskServiceImpl implements FollowTaskService {
@Override @Override
public Integer cancelFollowTask(FollowTaskIdRequest request, String userId) { public Integer cancelFollowTask(FollowTaskIdRequest request, String userId) {
HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId()); HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId());
if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus())){ if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.OVERDUE_FINISH.getCode().equals(followTask.getTaskStatus())){
throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
} }
checkLine(followTask.getPartnerLineId()); checkLine(followTask.getPartnerLineId());
return hyFollowTaskDAO.cancelFollowTask(request.getFollowTaskId()); FollowTaskStatusEnum followTaskStatus = FollowTaskStatusEnum.CANCELLED;
if(followTask.getDeadline().getTime() < System.currentTimeMillis()){
followTaskStatus = FollowTaskStatusEnum.OVERDUE_CANCELLED;
}
return hyFollowTaskDAO.cancelFollowTask(request.getFollowTaskId(), followTaskStatus);
} }
@Override @Override