feat: 个人承接积分包终止3

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

@@ -2899,6 +2899,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		// 查询积分包
 		WmScorePackage scorePackage = this.getById(packageId);
+		if (ScorePackageStatusEnum.TERMINATED.val().equals(scorePackage.getScorePackageStatus())
+				|| ScorePackageStatusEnum.TO_BE_SETTLED.val().equals(scorePackage.getScorePackageStatus())) {
+			throw new RuntimeException("积分包已完成或已终止");
+		}
 		// 查询上级积分包
 		WmScorePackage parentScorePackage = null;
 		if (StrUtil.isNotBlank(scorePackage.getRelationScoreId())) {
@@ -2943,8 +2947,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			// 全部终止: 改为已终止
 			updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TERMINATED.val());
 		} else {
-			// 剩余回收: 改为已完成待结算/已完成待上级审批
-			updateScorePackage.setScore(approvedScore);
+			// 剩余回收: 没完成的那部分(剩余回收积分值 = 积分包值 - 审核通过的任务积分值)
+			updateScorePackage.setScore(scorePackage.getScore() - approvedScore);
 			// 根据是否存在父级包,更新积分包完成状态
 			updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
 		}