feat: 结算状态手动回调-加校验

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -955,10 +955,15 @@ public class WmPayOffController {
 		// 查询结算中的数据
 		List<WmScorePackageSettleNote> settleNoteByidList = wmScorePackageSettleNoteService.list(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
 				.in(WmScorePackageSettleNote::getPackageId, packageIdList)
-				.eq(WmScorePackageSettleNote::getSettleNoteStatus, Integer.parseInt(SettleStatusEnum.SETTLE_STATUS_SUBMIT.getVal())));
-		log.info("结算信息查询：{}", settleNoteByidList);
+//				.eq(WmScorePackageSettleNote::getSettleNoteStatus, Integer.parseInt(SettleStatusEnum.SETTLE_STATUS_SUBMIT.getVal()))
+		);
+
 		if (CollUtil.isEmpty(settleNoteByidList)) {
-			throw new BizException("结算信息不存在或状态不是已提交: " + scorePackageName);
+			throw new BizException("结算信息不存在");
+		}
+		if (!settleNoteByidList.stream()
+				.allMatch(note -> SettleStatusEnum.SETTLE_STATUS_SUBMIT.getVal().equals(String.valueOf(note.getSettleNoteStatus())))) {
+			throw new BizException("存在结算状态不是已提交的数据");
 		}
 
 		settleNoteByidList.forEach(note -> {
@@ -966,7 +971,7 @@ public class WmPayOffController {
 			wmScorePackageSettleNoteService.updateSettleNoteById(note.getPackageId(), note.getId(), settleStatus, remark, notifyTime);
 		});
 
-
+		log.info("提交的结算数据个数{}, 实际操作成功的个数{}", packageIdList.size(), settleNoteByidList.size());
 		// 结束输出
 		log.info("===== 手工回调结束 =====");