feat: 合创众盈subject_location字段结算

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

@@ -23,6 +23,8 @@ public enum SubjectTypeEnum {
 	TYPE_SHEN_ZHEN_REN_CAI("10", "深圳人才"),
 	TYPE_YI_MA("11", "易马财税"),
 
+	TYPE_HE_CHUANG("13", "合创众盈"),
+
 	ENABLE_FLAG_FALSE("0", "无效"),
 	ENABLE_FLAG_TRUE("1", "有效"),
 

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

@@ -802,6 +802,10 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		else if (SubjectTypeEnum.TYPE_YI_MA.getCode().equals(subType)){
 			return this.settleByYiMa(input, wmScorePackage, taxCode, operator);
 		}
+		// 合创众盈
+		else if (SubjectTypeEnum.TYPE_HE_CHUANG.getCode().equals(subType)) {
+			return settleByOlading(input, wmScorePackage, taxCode, operator);
+		}
 		// 税邦云
 		else {
 			log.info("税邦云结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);

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

@@ -725,7 +725,7 @@ 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);
@@ -735,6 +735,11 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			String taxCode = sysDept.getTaxCode();
 			return this.settleByYiMa(note, wmScorePackage, sysUser, taxCode);
 		}
+		// 合创众盈
+		else if (SubjectTypeEnum.TYPE_HE_CHUANG.getCode().equals(subType)) {
+			String taxCode = sysDept.getTaxCode();
+			return settleByOlading(note, wmScorePackage, sysUser, taxCode);
+		}
 		// 税邦云
 		else {
 			String taxCode = sysDept.getTaxCode();
@@ -772,6 +777,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		List<WmScorePackageSettleNote> oladingNoteList = new ArrayList<>(ids.length);
 		List<WmScorePackageSettleNote> fuJianQiFuNoteList = new ArrayList<>(ids.length);
 		List<WmScorePackageSettleNote> shenZhenRenCaiNoteList = new ArrayList<>(ids.length);
+		List<WmScorePackageSettleNote> hechuangNoteList = 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);
@@ -906,6 +912,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			else if (SubjectTypeEnum.TYPE_YI_MA.getCode().equals(subType)) {
 				yiMaNoteList.add(note);
 			}
+			// 合创众盈
+			else if (SubjectTypeEnum.TYPE_HE_CHUANG.getCode().equals(subType)) {
+				hechuangNoteList.add(note);
+			}
 			// 税邦云
 			else {
 				noteList.add(note);
@@ -1005,8 +1015,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
-			SysDeptSub sysDeptSub = subMap.get(SubjectLocation.QI_FU.name());
-			return this.batchSettleByQiFu(shenZhenRenCaiNoteList, taxCode, sysDeptSub.getPathNo());
+			return this.batchSettleByOlading(shenZhenRenCaiNoteList, taxCode);
 		}
 
 		// 易马
@@ -1019,6 +1028,16 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			return this.batchSettleByYiMa(yiMaNoteList, taxCode);
 		}
 
+		// 合创众盈
+		if (CollectionUtils.isNotEmpty(hechuangNoteList)) {
+			if (StringUtils.isNotEmpty(taxCode)) {
+				log.info("合创众盈结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
+			} else {
+				return R.failed("未配置企业的统一社会信用代码");
+			}
+			return this.batchSettleByOlading(hechuangNoteList, taxCode);
+		}
+
 		return R.ok();
 	}