feat: 新增深圳人才税源地(底层为阿拉丁)

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

@@ -26,6 +26,7 @@ public enum GigTypeEnum {
 	ZHONG_YI_YUN(7, "众蚁云", "众蚁云", ZhongYiYunCertStatus.class),
 	ZHONG_ZHI(8, "中智", "中智", ZhongZhiCertStatus.class),
 	QI_FU(9, "福建企赋", "福建企赋", QiFuCertStatus.class),
+	SHEN_ZHEN_REN_CAI(10, "深圳人才", "深圳人才", OladingCertStatus.class),
 
 	MAH_SETTLE(99, "MAH结算", "MAH结算", null);
 
@@ -67,6 +68,7 @@ public enum GigTypeEnum {
 				certStatusStr = YeeCertStatus.resolve(String.valueOf(certStatus)).name();
 				break;
 			case OLADING:
+			case SHEN_ZHEN_REN_CAI:
 				certStatusStr = OladingCertStatus.resolve(String.valueOf(certStatus)).name();
 				break;
 			case ZHENG_QI_ZHI_XING:
@@ -113,6 +115,7 @@ public enum GigTypeEnum {
 				certStatusStr = YeeCertStatus.resolve(String.valueOf(certStatus)).getMessage();
 				break;
 			case OLADING:
+			case SHEN_ZHEN_REN_CAI:
 				certStatusStr = OladingCertStatus.resolve(String.valueOf(certStatus)).getMessage();
 				break;
 			case ZHENG_QI_ZHI_XING:

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

@@ -49,6 +49,7 @@ public enum SubjectLocation {
 	ZHONG_ZHI("ZHONG_ZHI", GigTypeEnum.ZHONG_ZHI, "中智", 12, "zhongzhi_invoice"),
 	ZHAO_YU("ZHAO_YU", GigTypeEnum.OLADING, "钉灵工-河南兆宇", 13, "olading_zhaoyu_invoice"),
 	QI_FU("QI_FU", GigTypeEnum.QI_FU, "福建企赋", 14, "qifu_invoice"),
+	SHEN_ZHEN_REN_CAI("SHEN_ZHEN_REN_CAI", GigTypeEnum.SHEN_ZHEN_REN_CAI, "深圳之光", 14, ""),
 
 
 	MAH_SETTLE("MAH_SETTLE", GigTypeEnum.MAH_SETTLE, "MAH结算", 99, "");

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

@@ -20,6 +20,7 @@ public enum SubjectTypeEnum {
 	TYPE_ZHONG_YI_YUN("7", "众蚁云"),
 	TYPE_ZHONG_ZHI("8", "中智"),
 	TYPE_QI_FU("9", "福建企赋"),
+	TYPE_SHEN_ZHEN_REN_CAI("10", "深圳人才"),
 
 	ENABLE_FLAG_FALSE("0", "无效"),
 	ENABLE_FLAG_TRUE("1", "有效"),

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -18,7 +18,6 @@ import com.qunzhixinxi.hnqz.admin.enums.*;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
-import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
 import com.qunzhixinxi.hnqz.common.rabbitmq.annotation.RabbitMqComponent;
 import com.qunzhixinxi.hnqz.common.rabbitmq.core.BaseRabbiMqHandler;
 import com.qunzhixinxi.hnqz.common.rabbitmq.listenter.MqListener;
@@ -55,8 +54,6 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 
 	private final SysUserSubService sysUserSubService;
 
-	private final SysUserSignCertService sysUserSignCertService;
-
 	private final RedisTemplate redisTemplate;
 
 	/**
@@ -150,6 +147,9 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 							case QI_FU:
 								this.qifuHandler(user, dept, subjectResult);
 								break;
+							case SHEN_ZHEN_REN_CAI:
+								this.oladingChannelHandler(user, dept, subjectResult, SubjectLocation.SHEN_ZHEN_REN_CAI);
+								break;
 							default:
 						}
 					});

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

@@ -1115,7 +1115,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			params.put("requestId", RandomStringUtils.randomAlphabetic(12));
 			params.put("endType", "CSO");
 			params.put("enterpriseCode", dept.getTaxCode());
-			params.put("subjectType", "OLADING");
+			params.put("subjectType", note.getSubjectLocation().getGigType().name());
 			params.put("channel", "DEFAULT");
 			params.put("subjectLocation", note.getSubjectLocation());
 			params.put("taskId", note.getThirdTaskId());

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

@@ -347,6 +347,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 					return R.ok();
 				}
 			case OLADING:
+			case SHEN_ZHEN_REN_CAI:
 				// 自由职家
 				if (OladingCertStatus.SIGNED.getCode().equals(String.valueOf(userSub.getCertStatus()))
 						|| OladingCertStatus.SIGNING.getCode().equals(String.valueOf(userSub.getCertStatus()))
@@ -636,6 +637,8 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 					return true;
 				} else if (GigTypeEnum.QI_FU.equals(sysUserSub.getGigType())) {
 					return true;
+				} else if (GigTypeEnum.SHEN_ZHEN_REN_CAI.equals(sysUserSub.getGigType())) {
+					return true;
 				}
 				return false;
 			}).forEach(userSub -> {

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

@@ -218,6 +218,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				case ZHONG_YI_YUN:
 				case ZHONG_ZHI:
 				case QI_FU:
+				case SHEN_ZHEN_REN_CAI:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						throw new RuntimeException(user.getRealname() + "未认证，不能发起结算");
 					}

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

@@ -633,6 +633,10 @@ 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());
 		}
+		// 深圳人才
+		else if (SubjectTypeEnum.TYPE_SHEN_ZHEN_REN_CAI.getCode().equals(subType)) {
+			return settleByOlading(input, wmScorePackage, taxCode, operator);
+		}
 		// 税邦云
 		else {
 			log.info("税邦云结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
@@ -1965,7 +1969,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("taskInvoiceContent", note.getCategoryName());
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
-				params.put("subjectType", "OLADING");
+				params.put("subjectType", input.getSubjectLocation().getGigType().name());
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", input.getSubjectLocation().getType());
 				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");

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

@@ -650,6 +650,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			case ZHONG_YI_YUN:
 			case ZHONG_ZHI:
 			case QI_FU:
+			case SHEN_ZHEN_REN_CAI:
 				if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 					return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
 				}
@@ -715,6 +716,11 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			String taxCode = sysDept.getTaxCode();
 			return this.settleByQiFu(note, wmScorePackage, sysUser, taxCode, sysDeptSub.getPathNo());
 		}
+		// 自由职家
+		else if (SubjectTypeEnum.TYPE_SHEN_ZHEN_REN_CAI.getCode().equals(subType)) {
+			String taxCode = sysDept.getTaxCode();
+			return settleByOlading(note, wmScorePackage, sysUser, taxCode);
+		}
 		// 税邦云
 		else {
 			String taxCode = sysDept.getTaxCode();
@@ -750,6 +756,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		String[] ids = input.getIdStr().split(",");
 		List<WmScorePackageSettleNote> noteList = new ArrayList<>(ids.length);
 		List<WmScorePackageSettleNote> oladingNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> fuJianQiFuNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> shenZhenRenCaiNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> zhengQiZhiXingNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> huiQiYunNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> zhongZhiNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> zhongYiYunNoteList = new ArrayList<>(ids.length);
 		List<WmScorePackageSettleNote> langchaoNoteList = new ArrayList<>(ids.length);
 		for (int i = 0; i < ids.length; i++) {
 			String id = ids[i];
@@ -805,6 +817,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				case ZHONG_YI_YUN:
 				case ZHONG_ZHI:
 				case QI_FU:
+				case SHEN_ZHEN_REN_CAI:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
 					}
@@ -834,10 +847,33 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 			}
 			// 自由职家
-			else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(subType) || SubjectTypeEnum.TYPE_ZHENG_QI_ZHI_XING.getCode().equals(subType)
-					|| SubjectTypeEnum.TYPE_HUI_QI_YUN.getCode().equals(subType) || SubjectTypeEnum.TYPE_ZHONG_ZHI.getCode().equals(subType)) {
+			else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(subType)) {
 				oladingNoteList.add(note);
 			}
+			// 汇企云
+			else if (SubjectTypeEnum.TYPE_HUI_QI_YUN.getCode().equals(subType)) {
+				huiQiYunNoteList.add(note);
+			}
+			// 正启之星
+			else if (SubjectTypeEnum.TYPE_ZHENG_QI_ZHI_XING.getCode().equals(subType)) {
+				zhengQiZhiXingNoteList.add(note);
+			}
+			// 中智
+			else if (SubjectTypeEnum.TYPE_ZHONG_ZHI.getCode().equals(subType)) {
+				zhongZhiNoteList.add(note);
+			}
+			// 众蚁云
+			else if (SubjectTypeEnum.TYPE_ZHONG_YI_YUN.getCode().equals(subType)) {
+				zhongYiYunNoteList.add(note);
+			}
+			// 福建企赋
+			else if (SubjectTypeEnum.TYPE_QI_FU.getCode().equals(subType)) {
+				fuJianQiFuNoteList.add(note);
+			}
+			// 深圳人才
+			else if (SubjectTypeEnum.TYPE_SHEN_ZHEN_REN_CAI.getCode().equals(subType)) {
+				shenZhenRenCaiNoteList.add(note);
+			}
 			// 浪潮
 			else if (SubjectTypeEnum.TYPE_LANG_CHAO.getCode().equals(subType)) {
 				langchaoNoteList.add(note);
@@ -866,13 +902,13 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			// return settleByTaxHelper();
 		}
 		// 政企之星结算
-		if (CollectionUtils.isNotEmpty(oladingNoteList)) {
+		if (CollectionUtils.isNotEmpty(zhengQiZhiXingNoteList)) {
 			if (StringUtils.isNotEmpty(taxCode)) {
 				log.info("政企之星结算结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
-			return batchSettleBySinbaad(oladingNoteList, taxCode);
+			return batchSettleBySinbaad(zhengQiZhiXingNoteList, taxCode);
 			// return settleByTaxHelper();
 		}
 
@@ -893,45 +929,56 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		}
 
 		// 汇企云结算
-		if (CollectionUtils.isNotEmpty(oladingNoteList)) {
+		if (CollectionUtils.isNotEmpty(huiQiYunNoteList)) {
 			if (StringUtils.isNotEmpty(taxCode)) {
 				log.info("汇企云结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
 			SysDeptSub sysDeptSub = subMap.get(SubjectLocation.HUI_QI_YUN.name());
-			return this.batchSettleByHuiQiYun(oladingNoteList, taxCode, sysDeptSub.getPathNo());
+			return this.batchSettleByHuiQiYun(huiQiYunNoteList, taxCode, sysDeptSub.getPathNo());
 		}
 
 		// 众蚁云
-		if (CollectionUtils.isNotEmpty(oladingNoteList)) {
+		if (CollectionUtils.isNotEmpty(zhongYiYunNoteList)) {
 			if (StringUtils.isNotEmpty(taxCode)) {
 				log.info("众蚁云结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
-			return this.batchSettleByZHongYiYun(oladingNoteList, taxCode);
+			return this.batchSettleByZHongYiYun(zhongYiYunNoteList, taxCode);
 		}
 
 		// 中智
-		if (CollectionUtils.isNotEmpty(oladingNoteList)) {
+		if (CollectionUtils.isNotEmpty(zhongZhiNoteList)) {
 			if (StringUtils.isNotEmpty(taxCode)) {
 				log.info("中智结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
-			return this.batchSettleByZhongzhi(oladingNoteList, taxCode);
+			return this.batchSettleByZhongzhi(zhongZhiNoteList, taxCode);
 		}
 
-		// 中智
-		if (CollectionUtils.isNotEmpty(oladingNoteList)) {
+		// 福建企赋
+		if (CollectionUtils.isNotEmpty(fuJianQiFuNoteList)) {
 			if (StringUtils.isNotEmpty(taxCode)) {
-				log.info("中智结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
+				log.info("福建企赋结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
+			} else {
+				return R.failed("未配置企业的统一社会信用代码");
+			}
+			SysDeptSub sysDeptSub = subMap.get(SubjectLocation.QI_FU.name());
+			return this.batchSettleByQiFu(fuJianQiFuNoteList, taxCode, sysDeptSub.getPathNo());
+		}
+
+		// 深圳人才
+		if (CollectionUtils.isNotEmpty(shenZhenRenCaiNoteList)) {
+			if (StringUtils.isNotEmpty(taxCode)) {
+				log.info("深圳人才结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
 			SysDeptSub sysDeptSub = subMap.get(SubjectLocation.QI_FU.name());
-			return this.batchSettleByQiFu(oladingNoteList, taxCode, sysDeptSub.getPathNo());
+			return this.batchSettleByQiFu(shenZhenRenCaiNoteList, taxCode, sysDeptSub.getPathNo());
 		}
 
 		return R.ok();
@@ -2239,7 +2286,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("taskInvoiceContent", note.getCategoryName());
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
-				params.put("subjectType", "OLADING");
+				params.put("subjectType", note.getSubjectLocation().getGigType().name());
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", note.getSubjectLocation());
 				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
@@ -3420,7 +3467,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("taskInvoiceContent", note.getCategoryName());
 			params.put("endType", "CSO");
 			params.put("enterpriseCode", taxCode);
-			params.put("subjectType", "OLADING");
+			params.put("subjectType", note.getSubjectLocation().getGigType().name());
 			params.put("channel", "DEFAULT");
 			params.put("subjectLocation", note.getSubjectLocation());
 			params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");