feat: 拆包需求修改2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -2541,19 +2541,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		if (selectTaskScore >= scorePackage.getScore()) {
 			throw new RuntimeException("“已选总任务积分”必须小于“总积分包值”");
 		}
-
-		// 剩余任务
-		List<WmTask> remainTaskList = taskList.stream()
-				.filter(task -> !unpackDTO.getSelectTaskIds().contains(task.getId())).collect(Collectors.toList());
-		// 剩余任务分值
-		int remainTaskScore = remainTaskList.stream().mapToInt(WmTask::getScore).sum();
-
 		// 拆包后的原积分包包值：取剩任务分值
-		if (!unpackDTO.getRemainPackageScore().equals(remainTaskScore)) {
+		int oldScorePackageScore = scorePackage.getScore() - selectTaskScore;
+		if (!unpackDTO.getRemainPackageScore().equals(oldScorePackageScore)) {
 			throw new RuntimeException("原积分包剩余积分包值不正确");
 		}
 
-
 		LocalDateTime now = LocalDateTime.now();
 		Integer operatorId = SecurityUtils.getUser().getId();
 		// 创建新包
@@ -2580,14 +2573,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		this.save(newScorePackage);
 
 		// 更新原积分包包值
-		int oldScorePackageScore = scorePackage.getScore() - selectTaskScore;
 		WmScorePackage updateOldPackage = new WmScorePackage();
 		updateOldPackage.setId(unpackDTO.getScorePackageId());
-		updateOldPackage.setScore(remainTaskScore);
+		updateOldPackage.setScore(oldScorePackageScore);
 		updateOldPackage.setUpdateTime(now);
 		updateOldPackage.setUpdateUser(operatorId);
 		updateOldPackage.setRemark(String.format("%s; 原积分包值%s更新为%s",
-				StrUtil.emptyIfNull(updateOldPackage.getRemark()), scorePackage.getScore(), remainTaskScore));
+				StrUtil.emptyIfNull(updateOldPackage.getRemark()), scorePackage.getScore(), oldScorePackageScore));
 		log.info("更新原积分包参数：{}", updateOldPackage);
 		this.updateById(updateOldPackage);