Ver Fonte

fix: 阿拉钉结算补充subjectLocation参数

lixuesong há 2 anos atrás
pai
commit
ab3615a41c

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

@@ -541,19 +541,18 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
 				params.put("subjectType", "OLADING");
+				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", input.getSubjectLocation().getType());
 				params.put("taskDescription", "根据要求,执行、并完成学术推广活动,并以在线平台工具采集、记录活动内容");
 				params.put("acceptanceStandard", "完成不同任务获得不同任务积分,根据不同任务给与0~30000积分,每个积分兑换0.8~1.2元,按次数结算");
 
 
 				if (SubjectLocation.JIN_YUAN.equals(input.getSubjectLocation())) {
-					params.put("channel", "JIN_YUAN");
 					params.put("taxMode", "GENERAL");
 					params.put("transactionModel", "SUPERVISE");
 				}
 				// 海南飞亿 和 河南薪泰梓
 				else {
-					params.put("channel", SubjectLocation.FEI_YI.equals(input.getSubjectLocation()) ? "DEFAULT" : "XIN_TAI_ZI");
 					params.put("taxMode", "SPECIAL");
 					params.put("transactionModel", "CHANNEL");
 				}

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

@@ -813,17 +813,17 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
 				params.put("subjectType", "OLADING");
+				params.put("channel", "DEFAULT");
+				params.put("subjectLocation", note.getSubjectLocation());
 				params.put("taskDescription", "根据要求,执行、并完成学术推广活动,并以在线平台工具采集、记录活动内容");
 				params.put("acceptanceStandard", "完成不同任务获得不同任务积分,根据不同任务给与0~30000积分,每个积分兑换0.8~1.2元,按次数结算");
 
 				if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
-					params.put("channel", "JIN_YUAN");
 					params.put("taxMode", "GENERAL");
 					params.put("transactionModel", "SUPERVISE");
 				}
 				// 海南飞亿 和 河南薪泰梓
 				else {
-					params.put("channel", SubjectLocation.FEI_YI.equals(note.getSubjectLocation()) ? "DEFAULT" : "XIN_TAI_ZI");
 					params.put("taxMode", "SPECIAL");
 					params.put("transactionModel", "CHANNEL");
 				}
@@ -1079,18 +1079,18 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("endType", "CSO");
 			params.put("enterpriseCode", taxCode);
 			params.put("subjectType", "OLADING");
+			params.put("channel", "DEFAULT");
+			params.put("subjectLocation", note.getSubjectLocation());
 			params.put("taskDescription", "根据要求,执行、并完成学术推广活动,并以在线平台工具采集、记录活动内容");
 			params.put("acceptanceStandard", "完成不同任务获得不同任务积分,根据不同任务给与0~30000积分,每个积分兑换0.8~1.2元,按次数结算");
 
 
 			if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
-				params.put("channel", "JIN_YUAN");
 				params.put("taxMode", "GENERAL");
 				params.put("transactionModel", "SUPERVISE");
 			}
 			// 海南飞亿 和 河南薪泰梓
 			else {
-				params.put("channel", SubjectLocation.FEI_YI.equals(note.getSubjectLocation()) ? "DEFAULT" : "XIN_TAI_ZI");
 				params.put("taxMode", "SPECIAL");
 				params.put("transactionModel", "CHANNEL");
 			}