fix: 结算不成功状态 统一调整

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

@@ -734,11 +734,15 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 							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());
@@ -929,11 +933,14 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 							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 {
 						log.warn("汇企云结算提交成功 data 获取不到： {}", note.getSettleNo());
 						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
+						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
 					log.warn("汇企云结算失败： {}", note.getSettleNo());
@@ -1117,10 +1124,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					}
 					note.setUpdateTime(LocalDateTime.now());
-					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-					// 新增字段streamId
-					note.setStreamId(dataJsonObj.getStr("requestId"));
-					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
+
+					String requestId = dataJsonObj.getStr("requestId");
+					if (StrUtil.isNotBlank(requestId)) {
+						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 {
 					log.warn("浪潮结算失败： {}", note.getSettleNo());
 					note.setUpdateTime(LocalDateTime.now());
@@ -1297,11 +1312,14 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 							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 {
 						log.warn("政企之星结算提交成功 data 获取不到： {}", note.getSettleNo());
 						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
+						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
 					log.warn("政企之星结算失败： {}", note.getSettleNo());
@@ -1485,14 +1503,23 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 					if (dataJsonObj == null) {
 						log.warn("自由职家结算提交成功 data 获取不到： {}", note.getSettleNo());
 						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
+						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 					note.setUpdateTime(LocalDateTime.now());
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-					// 新增字段streamId
-					note.setStreamId(dataJsonObj.getStr("requestId"));
-					// 第三方任务id
-					note.setThirdTaskId(dataJsonObj.getStr("taskId"));
-					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
+
+					String requestId = dataJsonObj.getStr("requestId");
+					if (StrUtil.isNotBlank(requestId)) {
+						// 新增字段streamId
+						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());
+					}
 				} else {
 					log.warn("自由职家结算提交失败： {}", note.getSettleNo());
 					note.setUpdateTime(LocalDateTime.now());
@@ -1633,14 +1660,17 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				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 {
+					// 新增字段streamId
+					note.setStreamId(response.getMessage());
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 				}
 				note.setUpdateTime(LocalDateTime.now());
-				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-				// 新增字段streamId
-				note.setStreamId(response.getMessage());
-				noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 			} else {
 				log.info("税邦云结算提交失败： {}", note.getSettleNo());
 				note.setUpdateTime(LocalDateTime.now());

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

@@ -1008,20 +1008,23 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 							return;
 						}
 
+						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
+						LocalDateTime now = LocalDateTime.now();
+						note.setId(id);
+						note.setUpdateTime(now);
+						note.setSubToGigTime(now);
+
 						String requestId = dataJsonObj.getStr("requestId");
 						if (StrUtil.isNotBlank(requestId)) {
-							WmScorePackageSettleNote note = new WmScorePackageSettleNote();
-							LocalDateTime now = LocalDateTime.now();
-							note.setId(id);
-							note.setUpdateTime(LocalDateTime.now());
-							note.setSubToGigTime(now);
 							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 							// 新增字段streamId
 							note.setStreamId(requestId);
-							this.baseMapper.updateById(note);
 						} else {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 							log.info("众蚁云提交成功 message：{}", dataJsonObj.getStr("message"));
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
 						}
+						this.baseMapper.updateById(note);
 					});
 
 				} else {
@@ -1030,7 +1033,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setId(id);
 						log.info("众蚁云结算提交失败： {}", note.getSettleNo());
 						LocalDateTime now = LocalDateTime.now();
-						note.setUpdateTime(LocalDateTime.now());
+						note.setUpdateTime(now);
 						note.setSubToGigTime(now);
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 						this.baseMapper.updateById(note);
@@ -1048,7 +1051,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					note.setId(id);
 					log.info("众蚁云结算提交失败： {}", note.getSettleNo());
 					LocalDateTime now = LocalDateTime.now();
-					note.setUpdateTime(LocalDateTime.now());
+					note.setUpdateTime(now);
 					note.setSubToGigTime(now);
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					this.baseMapper.updateById(note);
@@ -1216,20 +1219,22 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 							return;
 						}
 
+						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
+						LocalDateTime now = LocalDateTime.now();
+						note.setId(id);
+						note.setSubToGigTime(now);
+						note.setUpdateTime(now);
 						String requestId = dataJsonObj.getStr("requestId");
 						if (StrUtil.isNotBlank(requestId)) {
-							WmScorePackageSettleNote note = new WmScorePackageSettleNote();
-							LocalDateTime now = LocalDateTime.now();
-							note.setId(id);
-							note.setUpdateTime(LocalDateTime.now());
-							note.setSubToGigTime(now);
 							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 							// 新增字段streamId
 							note.setStreamId(requestId);
-							this.baseMapper.updateById(note);
 						} else {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 							log.info("汇企云提交成功 message：{}", dataJsonObj.getStr("message"));
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
 						}
+						this.baseMapper.updateById(note);
 					});
 
 				} else {
@@ -1238,7 +1243,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setId(id);
 						log.info("汇企云结算提交失败： {}", note.getSettleNo());
 						LocalDateTime now = LocalDateTime.now();
-						note.setUpdateTime(LocalDateTime.now());
+						note.setUpdateTime(now);
 						note.setSubToGigTime(now);
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 						this.baseMapper.updateById(note);
@@ -1256,7 +1261,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					note.setId(id);
 					log.info("汇企云结算提交失败： {}", note.getSettleNo());
 					LocalDateTime now = LocalDateTime.now();
-					note.setUpdateTime(LocalDateTime.now());
+					note.setUpdateTime(now);
 					note.setSubToGigTime(now);
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					this.baseMapper.updateById(note);
@@ -1410,11 +1415,18 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						LocalDateTime now = LocalDateTime.now();
 						note.setId(id);
-						note.setUpdateTime(LocalDateTime.now());
+						note.setUpdateTime(now);
 						note.setSubToGigTime(now);
-						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-						// 新增字段streamId
-						note.setStreamId(dataJsonObj.getStr("requestId"));
+
+						String requestId = dataJsonObj.getStr("requestId");
+						if (StrUtil.isNotBlank(requestId)) {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+							// 新增字段streamId
+							note.setStreamId(requestId);
+						} else {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
+						}
 						this.baseMapper.updateById(note);
 					});
 
@@ -1586,20 +1598,23 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id);
 							return;
 						}
-						String requestId = dataJsonObj.getStr("requestId");
-						if (StrUtil.isBlank(requestId)) {
-							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id);
-							return;
-						}
 
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						LocalDateTime now = LocalDateTime.now();
 						note.setId(id);
-						note.setUpdateTime(LocalDateTime.now());
+						note.setUpdateTime(now);
 						note.setSubToGigTime(now);
-						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-						// 新增字段streamId
-						note.setStreamId(requestId);
+
+						String requestId = dataJsonObj.getStr("requestId");
+						if (StrUtil.isNotBlank(requestId)) {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+							// 新增字段streamId
+							note.setStreamId(requestId);
+						} else {
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id);
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						}
+
 						this.baseMapper.updateById(note);
 					});
 
@@ -1609,7 +1624,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setId(id);
 						log.info("政企之星结算提交失败： {}", note.getSettleNo());
 						LocalDateTime now = LocalDateTime.now();
-						note.setUpdateTime(LocalDateTime.now());
+						note.setUpdateTime(now);
 						note.setSubToGigTime(now);
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 						this.baseMapper.updateById(note);
@@ -1627,7 +1642,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					note.setId(id);
 					log.info("政企之星结算提交失败： {}", note.getSettleNo());
 					LocalDateTime now = LocalDateTime.now();
-					note.setUpdateTime(LocalDateTime.now());
+					note.setUpdateTime(now);
 					note.setSubToGigTime(now);
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					this.baseMapper.updateById(note);
@@ -1794,12 +1809,20 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						}
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						note.setId(id);
-						note.setUpdateTime(LocalDateTime.now());
-						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-						// 新增字段streamId
-						note.setStreamId(dataJsonObj.getStr("requestId"));
-						// 第三方任务id
-						note.setThirdTaskId(dataJsonObj.getStr("taskId"));
+						LocalDateTime now = LocalDateTime.now();
+						note.setSubToGigTime(now);
+						note.setUpdateTime(now);
+						String requestId = dataJsonObj.getStr("requestId");
+						if (StrUtil.isNotBlank(requestId)) {
+							// 新增字段streamId
+							note.setStreamId(requestId);
+							// 第三方任务id
+							note.setThirdTaskId(dataJsonObj.getStr("taskId"));
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+						} else {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
+						}
 						this.baseMapper.updateById(note);
 					});
 
@@ -1808,7 +1831,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						note.setId(id);
 						log.info("自由职家结算提交失败： {}", note.getSettleNo());
-						note.setUpdateTime(LocalDateTime.now());
+						LocalDateTime now = LocalDateTime.now();
+						note.setSubToGigTime(now);
+						note.setUpdateTime(now);
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 						this.baseMapper.updateById(note);
 						log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -1823,7 +1848,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 					note.setId(id);
 					log.info("自由职家结算提交失败： {}", note.getSettleNo());
-					note.setUpdateTime(LocalDateTime.now());
+					LocalDateTime now = LocalDateTime.now();
+					note.setUpdateTime(now);
+					note.setSubToGigTime(now);
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					this.baseMapper.updateById(note);
 					log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -1911,21 +1938,30 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				log.info("税邦云结算提交成功： {}", note.getSettleNo());
 				//streamId 获取不到
 				if (StringUtils.isEmpty(response.getMessage())) {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.info("税邦云结算提交成功 streamId 获取不到： {}", note.getSettleNo());
+					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
+				} else {
+					// 新增字段streamId
+					note.setStreamId(response.getMessage());
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 				}
-				note.setUpdateTime(LocalDateTime.now());
-				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-				// 新增字段streamId
-				note.setStreamId(response.getMessage());
+				LocalDateTime now = LocalDateTime.now();
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
+
 				this.baseMapper.updateById(note);
 			});
 			return R.ok("提交结算成功");
 		} else {
 			noteList.forEach(note -> {
 				log.info("税邦云结算提交失败： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				LocalDateTime now = LocalDateTime.now();
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 				this.baseMapper.updateById(note);
+				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
 			});
 			return R.ok("结算失败");
 
@@ -2020,24 +2056,32 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			}
 			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
 
-
+			LocalDateTime now = LocalDateTime.now();
 			if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
 				JSONObject dataJsonObj = settelObj.getJSONObject("data");
 
 				log.info("众蚁云结算提交成功： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				//data 获取不到
 				if (dataJsonObj != null) {
 					String requestId = dataJsonObj.getStr("requestId");
-					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-					// 新增字段streamId
-					note.setStreamId(requestId);
+					if (StrUtil.isNotBlank(requestId)) {
+						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+						// 新增字段streamId
+						note.setStreamId(requestId);
+					} else {
+						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+					}
 				} else {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("众蚁云结算提交成功 data 获取不到： {}", note.getSettleNo());
 				}
 			} else {
 				log.warn("众蚁云结算提交失败： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setSubToGigTime(now);
+				note.setUpdateTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2047,7 +2091,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		} catch (Exception e) {
 			log.error("", e);
 			log.warn("众蚁云结算提交失败： {}", note.getSettleNo());
-			note.setUpdateTime(LocalDateTime.now());
+			LocalDateTime now = LocalDateTime.now();
+			note.setSubToGigTime(now);
+			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2157,12 +2203,13 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			}
 			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
 
-
+			LocalDateTime now = LocalDateTime.now();
 			if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
 				JSONObject dataJsonObj = settelObj.getJSONObject("data");
 
 				log.info("汇企云结算提交成功： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				//data 获取不到
 				if (dataJsonObj != null) {
 					String requestId = dataJsonObj.getStr("requestId");
@@ -2170,11 +2217,14 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					// 新增字段streamId
 					note.setStreamId(requestId);
 				} else {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("汇企云结算提交成功 data 获取不到： {}", note.getSettleNo());
+					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 				}
 			} else {
 				log.warn("汇企云结算提交失败： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2184,7 +2234,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		} catch (Exception e) {
 			log.error("", e);
 			log.warn("汇企云结算提交失败： {}", note.getSettleNo());
-			note.setUpdateTime(LocalDateTime.now());
+			LocalDateTime now = LocalDateTime.now();
+			note.setUpdateTime(now);
+			note.setSubToGigTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2289,7 +2341,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			}
 			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
 
-
+			LocalDateTime now = LocalDateTime.now();
 			if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
 				JSONObject dataJsonObj = settelObj.getJSONObject("data");
 
@@ -2301,13 +2353,21 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				if (!StrUtil.equals("200", dataJsonObj.getStr("code"))) {
 					log.info("浪潮提交成功 code 状态异常");
 				}
-				note.setUpdateTime(LocalDateTime.now());
-				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-				// 新增字段streamId
-				note.setStreamId(dataJsonObj.getStr("requestId"));
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
+				String requestId = dataJsonObj.getStr("requestId");
+				if (StrUtil.isNotBlank(requestId)) {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+					// 新增字段streamId
+					note.setStreamId(requestId);
+				} else {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+				}
 			} else {
 				log.warn("浪潮结算提交失败： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2317,7 +2377,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		} catch (Exception e) {
 			log.error("", e);
 			log.warn("浪潮结算提交失败： {}", note.getSettleNo());
-			note.setUpdateTime(LocalDateTime.now());
+			LocalDateTime now = LocalDateTime.now();
+			note.setUpdateTime(now);
+			note.setSubToGigTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2408,28 +2470,34 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			}
 			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
 
-
+			LocalDateTime now = LocalDateTime.now();
 			if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
 				JSONObject dataJsonObj = settelObj.getJSONObject("data");
 
 				log.info("政企之星结算提交成功： {}", note.getSettleNo());
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				//data 获取不到
 				if (dataJsonObj != null) {
 					String requestId = dataJsonObj.getStr("requestId");
 					if (StrUtil.isNotBlank(requestId)) {
-						note.setUpdateTime(LocalDateTime.now());
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
 						note.setStreamId(requestId);
 					} else {
+						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 						log.warn("政企之星结算提交成功 requestId 获取不到： {}", note.getSettleNo());
+						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 					}
 				} else {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("政企之星结算提交成功 data 获取不到： {}", note.getSettleNo());
+					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 				}
 			} else {
 				log.warn("政企之星结算提交失败： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2439,7 +2507,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		} catch (Exception e) {
 			log.error("", e);
 			log.warn("政企之星结算提交失败： {}", note.getSettleNo());
-			note.setUpdateTime(LocalDateTime.now());
+			LocalDateTime now = LocalDateTime.now();
+			note.setUpdateTime(now);
+			note.setSubToGigTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2539,24 +2609,34 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			}
 			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
 
-
+			LocalDateTime now = LocalDateTime.now();
+			note.setSubToGigTime(now);
+			note.setUpdateTime(now);
 			if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
 				JSONObject dataJsonObj = settelObj.getJSONObject("data");
 				log.info("自由职家结算提交成功： {}", note.getSettleNo());
 				//streamId 获取不到
 				if (dataJsonObj == null) {
+					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 					log.warn("自由职家结算提交成功 data 获取不到： {}", note.getSettleNo());
+					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
 				} else {
-					note.setUpdateTime(LocalDateTime.now());
-					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-					// 新增字段streamId
-					note.setStreamId(dataJsonObj.getStr("requestId"));
-					// 第三方任务id
-					note.setThirdTaskId(dataJsonObj.getStr("taskId"));
+					String requestId = dataJsonObj.getStr("requestId");
+					if (StrUtil.isNotBlank(requestId)) {
+						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+						// 新增字段streamId
+						note.setStreamId(requestId);
+						// 第三方任务id
+						note.setThirdTaskId(dataJsonObj.getStr("taskId"));
+					} else {
+						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+						redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+					}
 				}
 			} else {
 				log.warn("自由职家结算提交失败： {}", note.getSettleNo());
-				note.setUpdateTime(LocalDateTime.now());
+				note.setSubToGigTime(now);
+				note.setUpdateTime(now);
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 				log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2566,7 +2646,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		} catch (Exception e) {
 			log.warn("自由职家结算提交失败： {}", note.getSettleNo());
 			log.error("自由职家结算异常", e);
-			note.setUpdateTime(LocalDateTime.now());
+			LocalDateTime now = LocalDateTime.now();
+			note.setSubToGigTime(now);
+			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2636,13 +2718,17 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			if (StringUtils.isEmpty(response.getMessage())) {
 				log.info("税邦云结算提交成功 streamId 获取不到： {}", note.getSettleNo());
 			}
-			note.setUpdateTime(LocalDateTime.now());
+			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());
-			note.setUpdateTime(LocalDateTime.now());
+			LocalDateTime now = LocalDateTime.now();
+			note.setSubToGigTime(now);
+			note.setUpdateTime(now);
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
 
 			log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
@@ -2691,6 +2777,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				note.getSettleNo(), wmScorePackage.getScorePackageName(),
 				note.getInvoiceType(), jsdList);
 
+		LocalDateTime now = LocalDateTime.now();
+		note.setSubToGigTime(now);
+		note.setUpdateTime(now);
+
 		//提交结算接口失败
 		if (!employPayResponse.isSuccess()) {
 			log.info("人力家接口调用失败，结算解锁settleNoteId：{}", note.getId());