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

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

@@ -427,11 +427,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setSubType(String.valueOf(input.getSubjectLocation().getGigType().getCode()));
 		updateEntity.setLocation(input.getSubjectLocation());
 		updateEntity.setSettlementDate(LocalDateTime.now());
-		if (SubjectLocation.MAH_SETTLE.equals(input.getSubjectLocation())) {
-			updateEntity.setMahSettleDeptId(input.getMahSettleDeptId());
-			// MAH结算提交给上级业务结算的标记
-			updateEntity.setMahSettleStep(UpmsType.MahSettleStep.BUSINESS);
-		}
 
 		if (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2())
 				&& !StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
@@ -446,6 +441,16 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			updateEntity.setSettleFlag("1");
 		}
 
+		if (SubjectLocation.MAH_SETTLE.equals(input.getSubjectLocation())) {
+			updateEntity.setMahSettleDeptId(input.getMahSettleDeptId());
+			// MAH结算提交给上级业务结算的标记
+			updateEntity.setMahSettleStep(UpmsType.MahSettleStep.BUSINESS);
+			// 这里是MAH业务提交到上级业务的情况,设为不可结算
+			updateEntity.setSettleFlag("0");
+			// 设为待结算
+			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.getVal());
+		}
+
 		wmScorePackageService.updateById(updateEntity);
 		noteService.saveOrUpdateBatch(notes);