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

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/ScorePackageStatusEnum.java

@@ -32,7 +32,7 @@ public enum ScorePackageStatusEnum {
 	/**
 	 * 已提交结算申请
 	 */
-	SETTLEMENT_SUBMITTED("5", "已提交结算申请"),
+	SETTLEMENT_SUBMITTED("5", "全部提交结算申请"),
 	/**
 	 * 已终止
 	 */
@@ -40,7 +40,9 @@ public enum ScorePackageStatusEnum {
 	/**
 	 * 已完成待提交审批
 	 */
-	TO_BE_APPROVAL("7", "已完成待上级审批");
+	TO_BE_APPROVAL("7", "已完成待上级审批"),
+	PART_SETTLEMENT_SUBMITTED("8", "部分提交结算申请"),
+	SUBMITTED_TO_DRUGENT("9", "已提交药企");
 
 	private final String val;
 

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

@@ -439,8 +439,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			updateEntity.setMahSettleStep(UpmsType.MahSettleStep.BUSINESS);
 			// 这里是MAH业务提交到上级业务的情况,设为不可结算
 			updateEntity.setSettleFlag("0");
-			// 设为待结算
-			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.getVal());
+			// 积分包状态设为已提交药企
+			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SUBMITTED_TO_DRUGENT.getVal());
 		} else {
 			updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
 			if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
@@ -468,6 +468,10 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 		WmScorePackage wmScorePackage = wmScorePackageService.getById(input.getId());
 
+		if (!ScorePackageStatusEnum.SUBMITTED_TO_DRUGENT.getVal().equals(wmScorePackage.getScorePackageStatus())) {
+			return R.failed("积分包状态不正确");
+		}
+
 		// 校验基本包状态
 		wmScorePackageService.checkPkgToSettle(wmScorePackage);