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

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

@@ -966,12 +966,16 @@ public class WmPayOffController {
 			throw new BizException("存在结算状态不是已提交的数据");
 		}
 
-		settleNoteByidList.forEach(note -> {
+		List<WmScorePackageSettleNote> toUpdateList = settleNoteByidList.stream()
+				.filter(note -> SettleStatusEnum.SETTLE_STATUS_SUBMIT.getVal().equals(String.valueOf(note.getSettleNoteStatus())))
+				.collect(Collectors.toList());
+
+		toUpdateList.forEach(note -> {
 			// 更新结算数据
 			wmScorePackageSettleNoteService.updateSettleNoteById(note.getPackageId(), note.getId(), settleStatus, remark, notifyTime);
 		});
 
-		log.info("提交的结算数据个数{}, 实际操作成功的个数{}", packageIdList.size(), settleNoteByidList.size());
+		log.info("提交的结算数据个数{}, 实际操作成功的个数{}", packageIdList.size(), toUpdateList.size());
 		// 结束输出
 		log.info("===== 手工回调结束 =====");
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/dto/NotifyByOneSelfDTO.java

@@ -16,7 +16,7 @@ public class NotifyByOneSelfDTO implements Serializable {
 	private static final long serialVersionUID = -1814430828743680757L;
 
 	/**
-	 * 积分包id
+	 * 积分包id(多个逗号拼接)
 	 */
 	private String packageId;