Pārlūkot izejas kodu

feat: 浪潮结算发起调整

lixuesong 2 gadi atpakaļ
vecāks
revīzija
19a9517852

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

@@ -555,7 +555,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", input.getSubjectLocation().getType());
 				params.put("taskDescription", "根据要求,执行、并完成学术推广活动,并以在线平台工具采集、记录活动内容");
-				params.put("acceptanceStandard", "完成不同任务获得不同任务积分,根据不同任务给与0~30000积分,每个积分兑换0.8~1.2元,按次数结算");
+				params.put("taskName", wmScorePackage.getScorePackageName() + "_" + System.currentTimeMillis());
 
 				if (SubjectLocation.JIN_YUAN.equals(input.getSubjectLocation())) {
 					params.put("taxMode", "GENERAL");
@@ -590,6 +590,10 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 						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(LocalDateTime.now());
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 					// 新增字段streamId

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

@@ -834,7 +834,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", note.getSubjectLocation());
 				params.put("taskDescription", "根据要求,执行、并完成学术推广活动,并以在线平台工具采集、记录活动内容");
-				params.put("acceptanceStandard", "完成不同任务获得不同任务积分,根据不同任务给与0~30000积分,每个积分兑换0.8~1.2元,按次数结算");
+				params.put("taskName", String.format("%s(%s)_%s", sysUser.getRealname(), sysUser.getUsername(), System.currentTimeMillis()));
 
 				if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
 					params.put("taxMode", "GENERAL");
@@ -903,6 +903,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 							log.info("浪潮提交成功 data 获取不到");
 							return;
 						}
+						if (!StrUtil.equals("200", dataJsonObj.getStr("code"))) {
+							log.info("浪潮提交成功 code 状态异常");
+							return;
+						}
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						LocalDateTime now = LocalDateTime.now();
 						note.setId(id);
@@ -1491,7 +1495,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("channel", "DEFAULT");
 			params.put("subjectLocation", note.getSubjectLocation());
 			params.put("taskDescription", "根据要求,执行、并完成学术推广活动,并以在线平台工具采集、记录活动内容");
-			params.put("acceptanceStandard", "完成不同任务获得不同任务积分,根据不同任务给与0~30000积分,每个积分兑换0.8~1.2元,按次数结算");
+			params.put("taskName", wmScorePackage.getScorePackageName() + "_" + System.currentTimeMillis());
 
 			if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
 				params.put("taxMode", "GENERAL");
@@ -1523,6 +1527,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				if (dataJsonObj == null) {
 					log.warn("浪潮结算提交成功 data 获取不到: {}", note.getSettleNo());
 				}
+				if (!StrUtil.equals("200", dataJsonObj.getStr("code"))) {
+					log.info("浪潮提交成功 code 状态异常");
+				}
 				note.setUpdateTime(LocalDateTime.now());
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 				// 新增字段streamId