feat: 结算包结算-错误提示信息

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

@@ -2272,6 +2272,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
 		String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
 
+		StringBuilder noticeInfo = new StringBuilder();
 		try {
 			// 获取请求token
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
@@ -2352,19 +2353,24 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
 						note.setStreamId(requestId);
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 					} else {
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						noticeInfo.append(sysUser.getRealname()).append("：" + dataJsonObj.getStr("message"));
 						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("中智结算提交成功 data 获取不到： {}", note.getSettleNo());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
+					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 				}
 			} else {
 				log.warn("中智结算提交失败： {}", note.getSettleNo());
 				note.setSubToGigTime(now);
 				note.setUpdateTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+				noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settelObj.getStr("msg")).append("；");
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2377,6 +2383,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			note.setSubToGigTime(now);
 			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败;");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2384,7 +2391,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(null, noticeInfo.toString());
 	}
 
 	/**
@@ -2415,6 +2422,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
 		String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
 
+		StringBuilder noticeInfo = new StringBuilder();
 		try {
 			// 获取请求token
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
@@ -2489,12 +2497,15 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
 						note.setStreamId(requestId);
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 					} else {
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						noticeInfo.append(sysUser.getRealname()).append("：" + dataJsonObj.getStr("message"));
 						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					log.warn("众蚁云结算提交成功 data 获取不到： {}", note.getSettleNo());
 				}
 			} else {
@@ -2502,6 +2513,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				note.setSubToGigTime(now);
 				note.setUpdateTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+				noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settelObj.getStr("msg")).append("；");
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2514,6 +2526,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			note.setSubToGigTime(now);
 			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败;");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2521,7 +2534,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(null, noticeInfo.toString());
 	}
 
 	/**
@@ -2553,6 +2566,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
 		String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
 
+		StringBuilder noticeInfo = new StringBuilder();
 		try {
 			// 获取请求token
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
@@ -2636,12 +2650,15 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
 						note.setStreamId(requestId);
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 					} else {
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						noticeInfo.append(sysUser.getRealname()).append("：" + dataJsonObj.getStr("message"));
 						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					log.warn("汇企云结算提交成功 data 获取不到： {}", note.getSettleNo());
 					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 				}
@@ -2650,6 +2667,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				note.setUpdateTime(now);
 				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+				noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settelObj.getStr("msg")).append("；");
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2662,6 +2680,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			note.setUpdateTime(now);
 			note.setSubToGigTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败;");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2669,7 +2688,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(null, noticeInfo.toString());
 	}
 
 	/**
@@ -2701,6 +2720,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
 		String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
 
+		StringBuilder noticeInfo = new StringBuilder();
 		try {
 			// 获取请求token
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
@@ -2773,9 +2793,11 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				//data 获取不到
 				if (dataJsonObj == null) {
 					log.warn("浪潮结算提交成功 data 获取不到： {}", note.getSettleNo());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 				}
 				if (!StrUtil.equals("200", dataJsonObj.getStr("code"))) {
 					log.info("浪潮提交成功 code 状态异常");
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 				}
 				note.setUpdateTime(now);
 				note.setSubToGigTime(now);
@@ -2784,8 +2806,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 					// 新增字段streamId
 					note.setStreamId(requestId);
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 				} else {
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 				}
 			} else {
@@ -2793,6 +2817,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				note.setUpdateTime(now);
 				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+				noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settelObj.getStr("msg")).append("；");
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2805,6 +2830,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			note.setUpdateTime(now);
 			note.setSubToGigTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败;");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2812,7 +2838,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(null, noticeInfo.toString());
 	}
 
 	private R settleBySinbaad(WmScorePackageSettleNote note,
@@ -2834,6 +2860,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
 		String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
 
+		StringBuilder noticeInfo = new StringBuilder();
 		try {
 			// 获取请求token
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
@@ -2908,14 +2935,17 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
 						note.setStreamId(requestId);
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 					} else {
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 						log.warn("政企之星结算提交成功 requestId 获取不到： {}", note.getSettleNo());
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("政企之星结算提交成功 data 获取不到： {}", note.getSettleNo());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 				}
 			} else {
@@ -2923,6 +2953,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				note.setUpdateTime(now);
 				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+				noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settelObj.getStr("msg")).append("；");
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2935,6 +2966,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			note.setUpdateTime(now);
 			note.setSubToGigTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败;");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -2942,7 +2974,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(null, noticeInfo.toString());
 	}
 
 	private R settleByOlading(WmScorePackageSettleNote note,
@@ -2964,6 +2996,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
 		String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
 
+		StringBuilder noticeInfo = new StringBuilder();
 		try {
 			// 获取请求token
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
@@ -3043,6 +3076,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				if (dataJsonObj == null) {
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("自由职家结算提交成功 data 获取不到： {}", note.getSettleNo());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
 				} else {
 					String requestId = dataJsonObj.getStr("requestId");
@@ -3052,8 +3086,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setStreamId(requestId);
 						// 第三方任务id
 						note.setThirdTaskId(dataJsonObj.getStr("taskId"));
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 					} else {
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				}
@@ -3062,6 +3098,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				note.setSubToGigTime(now);
 				note.setUpdateTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+				noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settelObj.getStr("msg")).append("；");
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -3074,6 +3111,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			note.setSubToGigTime(now);
 			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败;");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -3081,7 +3119,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(null, noticeInfo.toString());
 	}
 
 
@@ -3135,25 +3173,31 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		log.info("税邦云结算： {}", response);
 
-
+		StringBuilder noticeInfo = new StringBuilder();
 		if (response.success()) {
 			log.info("税邦云结算提交成功： {}", note.getSettleNo());
 			//streamId 获取不到
 			if (StringUtils.isEmpty(response.getMessage())) {
+				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 				log.info("税邦云结算提交成功 streamId 获取不到： {}", note.getSettleNo());
+				noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
+				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+			} else {
+				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+				// 新增字段streamId
+				note.setStreamId(response.getMessage());
+				noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 			}
 			LocalDateTime now = LocalDateTime.now();
 			note.setSubToGigTime(now);
 			note.setUpdateTime(now);
-			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-			// 新增字段streamId
-			note.setStreamId(response.getMessage());
 		} else {
 			log.info("税邦云结算提交失败： {}", note.getSettleNo());
 			LocalDateTime now = LocalDateTime.now();
 			note.setSubToGigTime(now);
 			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+			noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(response.getMessage()).append("；");
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
@@ -3162,7 +3206,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(Boolean.TRUE, noticeInfo.toString());
 	}
 
 	private R settleByRenLiJia(WmScorePackageSettleNote note, DingConfig config, WmScorePackage wmScorePackage,
@@ -3205,10 +3249,13 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		note.setSubToGigTime(now);
 		note.setUpdateTime(now);
 
+		// 进入结算环节  noticeInfo 失败原因
+		StringBuilder noticeInfo = new StringBuilder();
 		//提交结算接口失败
 		if (!employPayResponse.isSuccess()) {
 			log.info("人力家接口调用失败，结算解锁settleNoteId：{}", note.getId());
 			redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+			noticeInfo.append("结算对象-").append(sysUser.getRealname()).append("：提交结算失败").append(employPayResponse.getCode()).append(employPayResponse.getMsg());
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 		} else {
@@ -3217,6 +3264,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			if (CollectionUtils.isNotEmpty(successResult)) {
 
 				log.info("结算对象-" + sysUser.getRealname() + "：提交结算成功；");
+				noticeInfo.append("结算对象-").append(sysUser.getRealname()).append("：提交结算成功；");
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 			}
 
@@ -3228,13 +3276,14 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 
 				log.info("结算对象-" + sysUser.getRealname() + "，结算失败：" + failResult.get(0).getCheckRemark() + "；");
+				noticeInfo.append("结算对象-").append(sysUser.getRealname()).append("，结算失败：").append(failResult.get(0).getCheckRemark()).append("；");
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 			}
 		}
 
 		this.baseMapper.updateById(note);
 
-		return R.ok();
+		return R.ok(Boolean.TRUE, noticeInfo.toString());
 	}
 
 	@Override