|
@@ -2964,20 +2964,20 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
log.info("积分包更新参数:{}", updateScorePackage);
|
|
log.info("积分包更新参数:{}", updateScorePackage);
|
|
this.updateById(updateScorePackage);
|
|
this.updateById(updateScorePackage);
|
|
|
|
|
|
- // 更新任务状态
|
|
|
|
|
|
+ // 更新任务状态(全部终止: 更新所有任务状态为禁用, 剩余回收: 暂不操作)
|
|
if (UpmsType.TerminatePackageType.ALL.equals(terminatePackageType)) {
|
|
if (UpmsType.TerminatePackageType.ALL.equals(terminatePackageType)) {
|
|
// 全部终止: 更新所有任务状态为禁用
|
|
// 全部终止: 更新所有任务状态为禁用
|
|
Set<String> taskIds = taskList.stream().map(WmTask::getId).collect(Collectors.toSet());
|
|
Set<String> taskIds = taskList.stream().map(WmTask::getId).collect(Collectors.toSet());
|
|
- log.info("任务更新参数(全部终止):taskIds={},packageId={},enableFlag={}", taskIds, packageId, EnableEnum.DISABLE.val());
|
|
|
|
- wmTaskMapper.update(null, Wrappers.<WmTask>lambdaUpdate()
|
|
|
|
- .in(WmTask::getId, taskIds)
|
|
|
|
- .eq(WmTask::getScorePackageId, packageId)
|
|
|
|
- .set(WmTask::getEnableFlag, EnableEnum.DISABLE.val()));
|
|
|
|
- } else {
|
|
|
|
- // 剩余回收: 暂不操作
|
|
|
|
-
|
|
|
|
|
|
+ if (CollUtil.isNotEmpty(taskIds)) {
|
|
|
|
+ log.info("任务更新参数(全部终止):taskIds={},packageId={},enableFlag={}", taskIds, packageId, EnableEnum.DISABLE.val());
|
|
|
|
+ wmTaskMapper.update(null, Wrappers.<WmTask>lambdaUpdate()
|
|
|
|
+ .in(WmTask::getId, taskIds)
|
|
|
|
+ .eq(WmTask::getScorePackageId, packageId)
|
|
|
|
+ .set(WmTask::getEnableFlag, EnableEnum.DISABLE.val()));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
// 更新领包记录状态
|
|
// 更新领包记录状态
|
|
//将所有未接单审核的,改成审核不通过
|
|
//将所有未接单审核的,改成审核不通过
|
|
log.info("更新领包记录参数:条件packageId={},status={}; 设置参数status={},taskAddFlag={}", packageId, "1", "3", "0");
|
|
log.info("更新领包记录参数:条件packageId={},status={}; 设置参数status={},taskAddFlag={}", packageId, "1", "3", "0");
|
|
@@ -3034,7 +3034,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
if (ScorePackageStatusEnum.TERMINATED.val().equals(scorePackage.getScorePackageStatus())) {
|
|
if (ScorePackageStatusEnum.TERMINATED.val().equals(scorePackage.getScorePackageStatus())) {
|
|
throw new RuntimeException("积分包已终止");
|
|
throw new RuntimeException("积分包已终止");
|
|
}
|
|
}
|
|
- if (scorePackage.getKfpjf() <= 0) {
|
|
|
|
|
|
+ // 可分配积分值
|
|
|
|
+ int recoveryScore = scorePackage.getKfpjf();
|
|
|
|
+ if (recoveryScore <= 0) {
|
|
throw new RuntimeException("积分包已全部分派");
|
|
throw new RuntimeException("积分包已全部分派");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3066,12 +3068,6 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
this.updateById(updateEntity);
|
|
this.updateById(updateEntity);
|
|
} else {
|
|
} else {
|
|
// 剩余回收
|
|
// 剩余回收
|
|
- // 可分配积分值
|
|
|
|
- int recoveryScore = scorePackage.getKfpjf();
|
|
|
|
- if (recoveryScore <= 0) {
|
|
|
|
- throw new RuntimeException("没有可回收的积分");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
// 剩余收回: 更新积分包分值为已分配的积分, 更新可分配积分值为0
|
|
// 剩余收回: 更新积分包分值为已分配的积分, 更新可分配积分值为0
|
|
WmScorePackage updateEntity = new WmScorePackage();
|
|
WmScorePackage updateEntity = new WmScorePackage();
|
|
updateEntity.setId(packageId);
|
|
updateEntity.setId(packageId);
|