feat: mah结算-代理商提交给药企时结算状态调整4

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

@@ -440,7 +440,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			// 这里是MAH业务提交到上级业务的情况,设为不可结算
 			updateEntity.setSettleFlag("0");
 			// 积分包状态设为已提交药企
-			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SUBMITTED_TO_DRUGENT.getVal());
+			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SUBMITTED_TO_DRUGENT.val());
 		} else {
 			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
 			if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {

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

@@ -2807,8 +2807,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			throw new RuntimeException("不支持该积分包类型");
 		}
 		// 业务校验1
-		if (!ScorePackageStatusEnum.TO_BE_SETTLED.val().equals(scorePackage.getScorePackageStatus())) {
-			throw new RuntimeException("只有“已完成待结算”的积分包可以拆包");
+		if (!ScorePackageStatusEnum.TO_BE_SETTLED.val().equals(scorePackage.getScorePackageStatus())
+				&& !ScorePackageStatusEnum.SUBMITTED_TO_DRUGENT.val().equals(scorePackage.getScorePackageStatus())) {
+			throw new RuntimeException("积分包状态不支持拆包");
 		}
 		// 原审核通过的任务列表
 		QueryWrapper<WmTask> queryWrapper = Wrappers.query();