fix: 薪事易临时封禁走线下

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

@@ -1124,53 +1124,61 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 
 				// 发起结算
-				String url1 = String.format(GIG_SETTLE_URL, upmsConfig.getGigServiceUrl());
-				log.info("远端请求gig-settle：{}", url);
-				HttpHeaders headers = new HttpHeaders();
-				headers.setContentType(MediaType.APPLICATION_JSON);
-				log.info("薪事易结算req： {}", params);
-				HttpEntity<String> result = new RestTemplate().exchange(url1, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
-				log.info("薪事易结算resp：{}", result.getBody());
-				if (!JSONUtil.isJson(result.getBody())) {
-					return R.failed("结算失败");
-				}
-
-				JSONObject settleObj = JSONUtil.parseObj(result.getBody());
-
-
-				if (Objects.equals(settleObj.getInt("code"), CommonConstants.SUCCESS)) {
-					JSONObject dataJsonObj = settleObj.getJSONObject("data");
-					log.info("薪事易结算提交成功： {}", settleObj.getStr("data"));
-					note.setUpdateTime(LocalDateTime.now());
-					//streamId 获取不到
-					if (dataJsonObj != null) {
-						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("：" + 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.setUpdateTime(LocalDateTime.now());
-					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
-					noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settleObj.getStr("msg")).append("；");
+//				String url1 = String.format(GIG_SETTLE_URL, upmsConfig.getGigServiceUrl());
+//				log.info("远端请求gig-settle：{}", url);
+//				HttpHeaders headers = new HttpHeaders();
+//				headers.setContentType(MediaType.APPLICATION_JSON);
+//				log.info("薪事易结算req： {}", params);
+//				HttpEntity<String> result = new RestTemplate().exchange(url1, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
+//				log.info("薪事易结算resp：{}", result.getBody());
+//				if (!JSONUtil.isJson(result.getBody())) {
+//					return R.failed("结算失败");
+//				}
+//
+//				JSONObject settleObj = JSONUtil.parseObj(result.getBody());
+//
+//
+//				if (Objects.equals(settleObj.getInt("code"), CommonConstants.SUCCESS)) {
+//					JSONObject dataJsonObj = settleObj.getJSONObject("data");
+//					log.info("薪事易结算提交成功： {}", settleObj.getStr("data"));
+//					note.setUpdateTime(LocalDateTime.now());
+//					//streamId 获取不到
+//					if (dataJsonObj != null) {
+//						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("：" + 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.setUpdateTime(LocalDateTime.now());
+//					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
+//					noticeInfo.append(sysUser.getRealname()).append("：结算提交失败-").append(settleObj.getStr("msg")).append("；");
+//
+//					log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
+//					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+//
+//				}
 
-					log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
-					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
+				LocalDateTime now = LocalDateTime.now();
+				note.setUpdateTime(now);
+				note.setSubToGigTime(now);
+				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+				note.setRemark("临时走线下,不发起结算请求");
+				noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 
-				}
 			} catch (Exception e) {
 				log.error("", e);
 				log.warn("薪事易结算提交失败： {}", note.getSettleNo());

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

@@ -3108,53 +3108,61 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 
 			// 发起结算
-			HttpHeaders headers = new HttpHeaders();
-			headers.setContentType(MediaType.APPLICATION_JSON);
-			log.info("薪事易结算req： {}", params);
-			HttpEntity<String> result = new RestTemplate().exchange(gigSettleUrl, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
-			log.info("薪事易结算resp： {}", result.getBody());
-			if (!JSONUtil.isJson(result.getBody())) {
-				return R.failed("结算失败");
-			}
-			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
+//			HttpHeaders headers = new HttpHeaders();
+//			headers.setContentType(MediaType.APPLICATION_JSON);
+//			log.info("薪事易结算req： {}", params);
+//			HttpEntity<String> result = new RestTemplate().exchange(gigSettleUrl, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
+//			log.info("薪事易结算resp： {}", result.getBody());
+//			if (!JSONUtil.isJson(result.getBody())) {
+//				return R.failed("结算失败");
+//			}
+//			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.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());
+//
+//			}
 
-			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.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());
-
-			}
+			LocalDateTime now = LocalDateTime.now();
+			note.setUpdateTime(now);
+			note.setSubToGigTime(now);
+			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+			note.setRemark("临时走线下,不发起结算请求");
+			noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 		} catch (Exception e) {
 			log.error("", e);
 			log.warn("薪事易结算提交失败： {}", note.getSettleNo());