feat: 福建企赋结算2

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

@@ -631,7 +631,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		}
 		// 福建企赋
 		else if (SubjectTypeEnum.TYPE_QI_FU.getCode().equals(subType)) {
-			return this.settleByQiFu(input, wmScorePackage, taxCode, operator, sysDeptSub.getPathNo());
+			return this.settleByQiFu(input, wmScorePackage, taxCode, operator);
 		}
 		// 深圳人才
 		else if (SubjectTypeEnum.TYPE_SHEN_ZHEN_REN_CAI.getCode().equals(subType)) {
@@ -657,8 +657,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 	private R<?> settleByQiFu(WmScorePackageSettleInput input,
 								  WmScorePackage wmScorePackage,
 								  String taxCode,
-								  HnqzUser operator,
-								  String[] pathNo) {
+								  HnqzUser operator) {
 
 		List<WmScorePackageSettleNote> notes = input.getNotes();
 		StringBuilder noticeInfo = new StringBuilder();
@@ -753,11 +752,12 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
 				params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
 				params.put("taskLocation", "要易云");
-				params.put("username", sysUser.getUsername());
+				params.put("username", sysUser.getBankPhone());
 				params.put("idCard", sysUser.getIdCardNumber());
 				params.put("idCardType","ID_CARD");
 				params.put("realName", sysUser.getRealname());
 				params.put("bankCard", sysUser.getBankCardNumber());
+				params.put("bankPhone", sysUser.getBankPhone());
 				// 市场推广
 				params.put("tagId", upmsConfig.getTagId());
 				params.put("taskInvoiceContent", note.getCategoryName());
@@ -766,19 +766,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("subjectType", "QI_FU");
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", input.getSubjectLocation().getType());
-				params.put("notes", pathNo[0]);
-				params.put("pathNo", pathNo[0]);
-				params.put("notifyUrl", String.format("%s/admin/gig-third-api/qifu", upmsConfig.getClientUrl()));
-
-				if (SubjectLocation.JIN_YUAN.equals(input.getSubjectLocation())) {
-					params.put("taxMode", "GENERAL");
-					params.put("transactionModel", "SUPERVISE");
-				}
-				// 海南飞亿 和 河南薪泰梓
-				else {
-					params.put("taxMode", "SPECIAL");
-					params.put("transactionModel", "CHANNEL");
-				}
+				params.put("taxMode", "SPECIAL");
+				params.put("transactionModel", "CHANNEL");
+				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 
 				// 发起结算
 				String url1 = String.format(GIG_SETTLE_URL, upmsConfig.getGigServiceUrl());

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

@@ -1060,11 +1060,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
 				params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
 				params.put("taskLocation", "要易云");
-				params.put("username", sysUser.getUsername());
+				params.put("username", sysUser.getBankPhone());
 				params.put("idCard", note.getIdCardNumber());
 				params.put("idCardType","ID_CARD");
 				params.put("realName", sysUser.getRealname());
 				params.put("bankCard", sysUser.getBankCardNumber());
+				params.put("bankPhone", sysUser.getBankPhone());
 				params.put("tagId", upmsConfig.getTagId());
 				params.put("taskInvoiceContent", note.getCategoryName());
 				params.put("endType", "CSO");
@@ -1072,19 +1073,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("subjectType", "QI_FU");
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", note.getSubjectLocation());
-				params.put("notes", pathNo[0]);
-				params.put("pathNo", pathNo[0]);
-				params.put("notifyUrl", String.format("%s/admin/gig-third-api/qifu", upmsConfig.getClientUrl()));
-
-				if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
-					params.put("taxMode", "GENERAL");
-					params.put("transactionModel", "SUPERVISE");
-				}
-				// 海南飞亿 和 河南薪泰梓
-				else {
-					params.put("taxMode", "SPECIAL");
-					params.put("transactionModel", "CHANNEL");
-				}
+				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
+				params.put("taxMode", "SPECIAL");
+				params.put("transactionModel", "CHANNEL");
 
 				Set<Integer> noteIds = new HashSet<>();
 				noteIds.add(note.getId());
@@ -2581,11 +2572,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
 			params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
 			params.put("taskLocation", "要易云");
-			params.put("username", sysUser.getUsername());
+			params.put("username", sysUser.getBankPhone());
 			params.put("idCard", sysUser.getIdCardNumber());
 			params.put("idCardType","ID_CARD");
 			params.put("realName", sysUser.getRealname());
 			params.put("bankCard", sysUser.getBankCardNumber());
+			params.put("bankPhone", sysUser.getBankPhone());
 			// 市场推广
 			params.put("tagId", upmsConfig.getTagId());
 			params.put("taskInvoiceContent", note.getCategoryName());
@@ -2594,19 +2586,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("subjectType", "QI_FU");
 			params.put("channel", "DEFAULT");
 			params.put("subjectLocation", note.getSubjectLocation().getType());
-			params.put("notes", pathNo[0]);
-			params.put("pathNo", pathNo[0]);
-			params.put("notifyUrl", String.format("%s/admin/gig-third-api/qifu", upmsConfig.getClientUrl()));
-
-			if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
-				params.put("taxMode", "GENERAL");
-				params.put("transactionModel", "SUPERVISE");
-			}
-			// 海南飞亿 和 河南薪泰梓
-			else {
-				params.put("taxMode", "SPECIAL");
-				params.put("transactionModel", "CHANNEL");
-			}
+			params.put("taxMode", "SPECIAL");
+			params.put("transactionModel", "CHANNEL");
+			params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 
 			// 发起结算
 			HttpHeaders headers = new HttpHeaders();