Merge branch 'feat-20220718-oladingreceipt'

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

@@ -19,7 +19,8 @@ public enum GigTypeEnum {
 	TAX_HELPOR(1, "税邦云", "税邦云"),
 	OLADING(2, "钉灵工", "钉灵工-海南飞亿"),
 	YEE(3, "易联数科", "易联数科"),
-	JIN_YUAN(4, "钉灵工", "金园数科");
+	JIN_YUAN(4, "钉灵工", "金园数科"),
+	XIN_TAI_ZI(5, "钉灵工", "钉灵工-河南薪泰梓");
 
 	@EnumValue
 	private int code;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectTypeEnum.java

@@ -14,6 +14,9 @@ public enum SubjectTypeEnum {
 	TYPE_SHUIBANGYUN("1", "税邦云"),
 	TYPE_OLADING("2", "自由职家"),
 	TYPE_YEE("3", "易联数科"),
+	TYPE_JIN_YUAN("4", "金园数科"),
+	TYPE_XIN_TAI_ZI("5", "薪泰梓"),
+
 
 	ENABLE_FLAG_FALSE("0", "无效"),
 	ENABLE_FLAG_TRUE("1", "有效"),

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

@@ -659,7 +659,10 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			return settleByRenLiJia(input, sysDeptSub, wmScorePackage);
 		}
 		// 自由职家
-		else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(input.getSubType())) {
+		else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(input.getSubType())
+			|| SubjectTypeEnum.TYPE_JIN_YUAN.getCode().equals(input.getSubType())
+			|| SubjectTypeEnum.TYPE_XIN_TAI_ZI.getCode().equals(input.getSubType())
+		) {
 			return settleByOlading(input, sysDeptSub, wmScorePackage, taxCode);
 		}
 		// 税邦云
@@ -791,11 +794,25 @@ 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("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 				params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
 
 
+				GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
+
+				if (GigTypeEnum.JIN_YUAN.equals(gigTypeEnum)) {
+					params.put("channel", "JIN_YUAN");
+					params.put("taxMode", "GENERAL");
+					params.put("transactionModel", "SUPERVISE");
+				}
+				// 海南飞亿 和 河南薪泰梓
+				else {
+					params.put("channel", GigTypeEnum.OLADING.equals(gigTypeEnum) ? "DEFAULT" : "XIN_TAI_ZI");
+					params.put("taxMode", "SPECIAL");
+					params.put("transactionModel", "CHANNEL");
+				}
+
+
 				// 发起结算
 				HttpHeaders headers = new HttpHeaders();
 				headers.setContentType(MediaType.APPLICATION_JSON);

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

@@ -523,6 +523,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		switch (gigTypeEnum) {
 			case REN_LI_JIA:
+			case JIN_YUAN:
+			case XIN_TAI_ZI:
 			case OLADING:
 				if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 					return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
@@ -553,7 +555,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		}
 		// 自由职家
-		else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType())) {
+		else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType())
+				|| SubjectTypeEnum.TYPE_JIN_YUAN.getCode().equals(note.getSubType())
+			|| SubjectTypeEnum.TYPE_XIN_TAI_ZI.getCode().equals(note.getSubType())
+		) {
 			String taxCode = sysDept.getTaxCode();
 			return settleByOlading(note, wmScorePackage, sysUser, taxCode);
 		}
@@ -636,6 +641,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 			switch (gigTypeEnum) {
 				case REN_LI_JIA:
+				case XIN_TAI_ZI:
+				case JIN_YUAN:
 				case OLADING:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
@@ -666,7 +673,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 			}
 			// 自由职家
-			else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType())) {
+			else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType()) || SubjectTypeEnum.TYPE_JIN_YUAN.getCode().equals(note.getSubType())
+				|| SubjectTypeEnum.TYPE_XIN_TAI_ZI.getCode().equals(note.getSubType())) {
 				oladingNoteList.add(note);
 			}
 			// 税邦云
@@ -790,10 +798,23 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
 				params.put("subjectType", "OLADING");
-				params.put("channel", "DEFAULT");
 				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 				params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
 
+				GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
+
+				if (GigTypeEnum.JIN_YUAN.equals(gigTypeEnum)) {
+					params.put("channel", "JIN_YUAN");
+					params.put("taxMode", "GENERAL");
+					params.put("transactionModel", "SUPERVISE");
+				}
+				// 海南飞亿 和 河南薪泰梓
+				else {
+					params.put("channel", GigTypeEnum.OLADING.equals(gigTypeEnum) ? "DEFAULT" : "XIN_TAI_ZI");
+					params.put("taxMode", "SPECIAL");
+					params.put("transactionModel", "CHANNEL");
+				}
+
 				Set<Integer> noteIds = new HashSet<>();
 				noteIds.add(note.getId());
 				params.put("noteIds", noteIds);
@@ -1045,11 +1066,25 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("endType", "CSO");
 			params.put("enterpriseCode", taxCode);
 			params.put("subjectType", "OLADING");
-			params.put("channel", "DEFAULT");
 			params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 			params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
 
 
+			GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
+
+			if (GigTypeEnum.JIN_YUAN.equals(gigTypeEnum)) {
+				params.put("channel", "JIN_YUAN");
+				params.put("taxMode", "GENERAL");
+				params.put("transactionModel", "SUPERVISE");
+			}
+			// 海南飞亿 和 河南薪泰梓
+			else {
+				params.put("channel", GigTypeEnum.OLADING.equals(gigTypeEnum) ? "DEFAULT" : "XIN_TAI_ZI");
+				params.put("taxMode", "SPECIAL");
+				params.put("transactionModel", "CHANNEL");
+			}
+
+
 			// 发起结算
 			HttpHeaders headers = new HttpHeaders();
 			headers.setContentType(MediaType.APPLICATION_JSON);