feat: mah结算-个人承接积分值结算发起调整2

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

@@ -422,7 +422,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setSettleAmount(total);
 		updateEntity.setId(input.getId());
 		updateEntity.setSettleStatus(DingEnum.SETTLE_STATUS_WAIT.getType());
-		updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
 		updateEntity.setDescription(input.getDescription());
 		updateEntity.setSubType(String.valueOf(input.getSubjectLocation().getGigType().getCode()));
 		updateEntity.setLocation(input.getSubjectLocation());
@@ -434,13 +433,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			updateEntity.setTaskAddFlag("0");
 		}
 
-		if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
-			// 多人承接积分包可以一直结算
-			updateEntity.setSettleFlag("0");
-		} else {
-			updateEntity.setSettleFlag("1");
-		}
-
 		if (SubjectLocation.MAH_SETTLE.equals(input.getSubjectLocation())) {
 			updateEntity.setMahSettleDeptId(input.getMahSettleDeptId());
 			// MAH结算提交给上级业务结算的标记
@@ -449,6 +441,14 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			updateEntity.setSettleFlag("0");
 			// 设为待结算
 			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.getVal());
+		} else {
+			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
+			if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
+				// 多人承接积分包可以一直结算
+				updateEntity.setSettleFlag("0");
+			} else {
+				updateEntity.setSettleFlag("1");
+			}
 		}
 
 		wmScorePackageService.updateById(updateEntity);