Merge branch 'develop'

# Conflicts:
#	yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/config/AsyncConfig.java
#	yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -200,7 +200,7 @@ public interface CommonConstants {
 	 * @Author pwang
 	 * @Date 2019-08-02 16:39
 	 **/
-	int[] dingleDigitIntArray = {0,1,2,3,4,5,6,7,8,9};
+	int[] dingleDigitIntArray = {0,1,2,3,4,5,6,7,8,9,10,11,12};
 	/**
 	 * 个位数字串（阿里编码规约不允许直接使用‘魔法值’）
 	 * @Author pwang

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java

@@ -731,7 +731,7 @@ public class ExcelUtil <T> implements Serializable {
 						}
 					}
 				}
-			}*/
+			}
 		}
 		return null;
 	}

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -148,12 +148,12 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelProperty("款项来源（0客户到款/1垫付）")
 	private Integer moneyFrom;
 	/**
-	 * 状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）
+	 * 状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印 10 推送失败 11 推送收入中12推送收入失败）
 	 */
-	@ExcelAttribute(name = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败）", isNotEmpty = true, errorInfo = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）不能为空")
-	@NotBlank(message = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败）不能为空")
+	@ExcelAttribute(name = "状态（0待提交1待审核2:待推送明细3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败 11 已审核生成收入中12已审核生成收入失败）", isNotEmpty = true, errorInfo = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）不能为空")
+	@NotBlank(message = "状态（0待提交1待审核2:待推送明细3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败 11 已审核生成收入中12已审核生成收入失败）不能为空")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印 10 推送失败）")
+	@ExcelProperty("状态（0待提交1待审核2:待推送明细3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印 10 推送失败 11 已审核生成收入中12已审核生成收入失败）")
 	private Integer status;
 	/**
 	 * 提交时间
@@ -415,6 +415,22 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelIgnore
 	private String bpoFlag;
 
+	/**
+	 * 生成、推送收入的开始时间
+	 */
+	@ExcelAttribute(name = "生成、推送收入的开始时间", isDate = true)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生成、推送收入的开始时间")
+	private Date incomeStartTime;
+
+	/**
+	 * 生成、推送收入的完成时间
+	 */
+	@ExcelAttribute(name = "生成、推送收入的完成时间", isDate = true)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生成、推送收入的完成时间")
+	private Date incomeEndTime;
+
 	/**
 	 * 工资月份-起
 	 */

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardExportVo.java

@@ -26,7 +26,7 @@ public class TSalaryStandardExportVo implements Serializable {
 	/**
 	 * 状态0待提交   1待审核  2审核通过   3发送成功   5审核不通过   10 发送失败
 	 */
-	@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,6=确认不通过,10=发送失败")
+	@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=待推送明细,3=发送成功,5=审核不通过,6=确认不通过,10=发送失败,11=已审核生成收入中,12=已审核生成收入失败")
 	@NotBlank(message = "状态（0待提交   1待审核  2审核通过   3发送成功   5审核不通过   10 发送失败）不能为空")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("薪酬状态")

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -229,4 +229,14 @@ public class TSalaryStandardController {
 	public R<String> backSalaryByApplyNo(@RequestParam String applyNo) {
 		return tSalaryStandardService.backSalaryByApplyNo(applyNo);
 	}
+
+	/**
+	 * @param id
+	 * @return
+	 */
+	@Operation(description = "重新生成收入")
+	@GetMapping("/salaryDoIncome")
+	public R<String> salaryDoIncome(@RequestParam String id) {
+		return tSalaryStandardService.salaryDoIncome(id);
+	}
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java

@@ -63,6 +63,15 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
 	 */
 	R<String> salaryStandardAudit(String auditFlag, String auditRemark,String id);
 
+	/**
+	 * @param id 工资表id
+	 * @Description: 重新生成收入
+	 * @Author: hgw
+	 * @Date: 2022/11/29 17:49
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> salaryDoIncome(String id);
+
 	/**
 	 * @Description: 删除工资表
 	 * @Author: hgw

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java

+package com.yifu.cloud.plus.v1.yifu.salary.util;
+
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
+import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardMapper;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @author hgw
+ * @Date 2022-11-29 16:31:09
+ * @Description 异步执行薪资
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+@EnableConfigurationProperties({DaprSocialProperties.class})
+public class DoJointSalaryAsyncTask {
+
+	private final DaprSocialProperties socialProperties;
+	private final TSalaryStandardMapper salaryStandardMapper;
+
+    /**
+     * @Description: 收入
+     * @Author: hgw
+     * @Date: 2022-11-29 17:28:494
+     **/
+    @Async
+    public void doIncomeDetail(TSettleDomainSelectVo dept, List<TSalaryAccount> salaryAccountList, String id, TSalaryStandard tSalaryStandard) {
+        log.info("推送收入到EKP-线程开始");
+
+		if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
+			List<String> idCardList = new ArrayList<>();
+			for (TSalaryAccount account : salaryAccountList) {
+				idCardList.add(account.getEmpIdcard());
+			}
+			Map<String, Integer> detailMap = new HashMap<>();
+			boolean isTrue = true;
+			TSalaryStandard s  = salaryStandardMapper.selectById(id);
+			try {
+				// 收入相关
+				R<String> failed1 = getIncomeDetailMap(tSalaryStandard, dept, idCardList, detailMap);
+				if (failed1 != null) {
+					isTrue = false;
+				} else {
+					// 含有薪资，则计算收入
+					// 管理费
+					if (Common.isNotNull(dept.getManageServerItem()) && dept.getManageServerItem().contains(CommonConstants.FOUR_STRING)
+							&& CommonConstants.ZERO_STRING.equals(dept.getManagementTag())) {
+						// 金额-人数
+						if (CommonConstants.TWO_STRING.equals(dept.getManagementType())) {
+							// 保存明细
+							isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, detailMap, dept.getManagementType(), CommonConstants.ONE_STRING);
+						} else {
+							// 保存明细
+							isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, new HashMap<>(), dept.getManagementType(), CommonConstants.ONE_STRING);
+						}
+					}
+					// 风险金
+					if (isTrue && Common.isNotNull(dept.getRiskServerItem()) && dept.getRiskServerItem().contains(CommonConstants.FOUR_STRING)
+							&& CommonConstants.ZERO_STRING.equals(dept.getRiskFundTag())) {
+						// 金额-人数
+						if (CommonConstants.TWO_STRING.equals(dept.getRiskFundType())) {
+							// 保存明细
+							isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, detailMap, dept.getRiskFundType(), CommonConstants.TWO_STRING);
+						} else {
+							// 保存明细
+							isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, new HashMap<>(), dept.getRiskFundType(), CommonConstants.TWO_STRING);
+						}
+					}
+				}
+			} catch (Exception e) {
+				isTrue = false;
+				log.error(e.getMessage());
+			}
+			if (s != null
+					&& (s.getStatus() == CommonConstants.dingleDigitIntArray[11]
+					|| s.getStatus() == CommonConstants.dingleDigitIntArray[12])) {
+				tSalaryStandard.setIncomeEndTime(new Date());
+				if (isTrue) {
+					s.setStatus(CommonConstants.TWO_INT);
+					salaryStandardMapper.updateById(s);
+				} else {
+					s.setStatus(CommonConstants.dingleDigitIntArray[12]);
+					salaryStandardMapper.updateById(s);
+				}
+			}
+		}
+
+        log.info("推送收入到EKP结束");
+    }
+
+	/**
+	 * @Description: 获取收入信息
+	 * @Author: hgw
+	 * @Date: 2022/9/6 10:39
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	private R<String> getIncomeDetailMap(TSalaryStandard tSalaryStandard, TSettleDomainSelectVo dept, List<String> idCardList, Map<String, Integer> detailMap) {
+		TIncomeDetail detail = new TIncomeDetail();
+		detail.setApplyNo(tSalaryStandard.getApplyNo());
+		detail.setPayMonth(tSalaryStandard.getSalaryMonth());
+		detail.setIdCardList(idCardList);
+		detail.setDeptId(dept.getId());
+		R<TIncomeDetailReturnVo> detailR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
+				, "/tincomedetail/inner/getTIncomeDetailList", detail
+				, TIncomeDetailReturnVo.class, SecurityConstants.FROM_IN);
+		Integer value;
+		if (detailR != null) {
+			if (detailR.getData() != null && detailR.getData().getDetailList() != null && !detailR.getData().getDetailList().isEmpty()) {
+				TIncomeDetailReturnVo vo = detailR.getData();
+				List<TIncomeDetail> detailList = vo.getDetailList();
+				for (TIncomeDetail incomeDetail : detailList) {
+					value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType()
+							+ CommonConstants.DOWN_LINE_STRING + incomeDetail.getSourceType());
+					if (Common.isEmpty(value)) {
+						value = CommonConstants.ZERO_INT;
+					}
+					if (CommonConstants.ZERO_STRING.equals(incomeDetail.getRedData())) {
+						value++;
+					} else {
+						value--;
+					}
+					detailMap.put(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getFeeType() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getSourceType(), value);
+				}
+			}
+		} else {
+			return R.failed("获取收入明细的详情出错，请联系管理员！");
+		}
+		return null;
+	}
+
+	/**
+	 * @param feeType  1按比例2金额-人数3金额-人次
+	 * @param isManage 1 管理费2 风险金
+	 * @Description: 保存明细
+	 * @Author: hgw
+	 * @Date: 2022/9/2 17:25
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	private boolean saveIncomeDetail(List<TSalaryAccount> salaryAccountList, TSalaryStandard tSalaryStandard
+			, TSettleDomainSelectVo dept, Map<String, Integer> detailMap, String feeType, String isManage) {
+		TIncomeDetail detail;
+		Integer value;
+		BigDecimal money;
+		for (TSalaryAccount account : salaryAccountList) {
+			value = detailMap.get(account.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+					+ account.getDeptId() + CommonConstants.DOWN_LINE_STRING + isManage
+					+ CommonConstants.DOWN_LINE_STRING
+					+ CommonConstants.FOUR_STRING);
+			if (Common.isEmpty(value) || value == 0) {
+				detail = new TIncomeDetail();
+				detail.setPayMonth(account.getSalaryMonth());
+				detail.setDeptId(account.getDeptId());
+				detail.setDeptName(account.getDeptName());
+				detail.setDeptNo(account.getDeptNo());
+				detail.setUnitId(tSalaryStandard.getUnitId());
+				detail.setUnitName(tSalaryStandard.getUnitName());
+				detail.setUnitNo(tSalaryStandard.getUnitNo());
+				detail.setCreateMonth(account.getSalaryMonth());
+				detail.setEmpIdcard(account.getEmpIdcard());
+				detail.setEmpName(account.getEmpName());
+				detail.setFeeMode(dept.getManagementType());
+				detail.setFeeType(isManage);
+				detail.setCharges(String.valueOf(dept.getManagementFee()));
+				money = dept.getManagementFee();
+				if (CommonConstants.TWO_STRING.equals(isManage)) {
+					money = dept.getRiskFundFee();
+					detail.setCharges(String.valueOf(dept.getRiskFundFee()));
+					detail.setFeeMode(dept.getRiskFundType());
+				}
+				if (CommonConstants.ONE_STRING.equals(feeType)) {
+					money = BigDecimalUtils.safeMultiply(account.getRelaySalary(), money, CommonConstants.ONE_OF_PERCENT);
+				}
+				detail.setMoney(money);
+				detail.setMrSettleType(dept.getMrSettleType());
+				detail.setRedData(CommonConstants.ZERO_STRING);
+				detail.setSourceId(account.getId());
+				detail.setSourceType(CommonConstants.FOUR_STRING);
+				detail.setApplyNo(tSalaryStandard.getApplyNo());
+				R<Boolean> saveR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
+						, "/tincome/inner/saveSalaryDetail", detail, Boolean.class, SecurityConstants.FROM_IN);
+				if (saveR == null || saveR.getCode() == CommonConstants.ONE_INT || Boolean.FALSE.equals(saveR.getData())) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -75,6 +75,8 @@
 	<result property="orderId" column="ORDER_ID"/>
 	<result property="bpoFlag" column="BPO_FLAG"/>
 	<result property="applyNo" column="APPLY_NO"/>
+	<result property="incomeStartTime" column="INCOME_START_TIME"/>
+	<result property="incomeEndTime" column="INCOME_END_TIME"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -128,7 +130,9 @@
 				a.INVOICE_TITLE,
 				a.ORDER_ID,
 				a.BPO_FLAG,
-				a.APPLY_NO
+				a.APPLY_NO,
+				a.INCOME_START_TIME,
+				a.INCOME_END_TIME
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TIncomeController.java

@@ -168,7 +168,19 @@ public class TIncomeController {
 	@Inner
 	@PostMapping("/inner/saveDetail")
 	public Boolean saveDetail(@RequestBody TIncomeDetail tIncomeDetail) {
-		return tIncomeService.saveDetail(tIncomeDetail);
+		return tIncomeService.saveDetail(tIncomeDetail,true);
+	}
+
+	/**
+	 * @Description: 薪资新增收入明细-详情表，同时统计；采用同步操作，因为薪资本身就是异步
+	 * @Author: hgw
+	 * @Date: 2022-11-29 17:29:29
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
+	 **/
+	@Inner
+	@PostMapping("/inner/saveSalaryDetail")
+	public Boolean saveSalaryDetail(@RequestBody TIncomeDetail tIncomeDetail) {
+		return tIncomeService.saveDetail(tIncomeDetail,false);
 	}
 
 	/**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java

@@ -128,8 +128,8 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	void createForecastInfo();
 	void createForecastFundInfo();
 
-	void pushForecastInfo(List<TForecastLibrary> library);
+	void pushForecastInfo(List<TForecastLibrary> library, boolean synFlag);
 
-	void pushForecastFundInfo(List<TForecastLibrary> library);
+	void pushForecastFundInfo(List<TForecastLibrary> library, boolean synFlag);
 
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TIncomeService.java

@@ -58,7 +58,7 @@ public interface TIncomeService extends IService<TIncome> {
 	 * @Date: 2022/8/31 16:31
 	 * @return: boolean
 	 **/
-	boolean saveDetail(TIncomeDetail tIncomeDetail);
+	boolean saveDetail(TIncomeDetail tIncomeDetail,boolean synFlag);
 
 	/**
 	 * @Description: 新增收入明细-详情表，同时统计；

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -53,6 +53,7 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
+import com.yifu.cloud.plus.v1.yifu.social.util.DoSocialTask;
 import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.RequiredArgsConstructor;
@@ -64,6 +65,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -117,6 +119,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 	ExcelUtil<Object> excelUtil = new ExcelUtil<>(Object.class);
 
+
+	@Autowired
+	private DoSocialTask socialTask;
+
 	/**
 	 * 派单信息记录表简单分页查询
 	 *
@@ -679,7 +685,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 				// 生成预付数据
 				if (Common.isNotNull(socialFund) && Common.isNotNull(socialFund.getId())){
-					forecastLibraryService.updateForecastLibaryByDispatch(socialFund);
+					socialTask.asynchronousDisPatchHandle(socialFund, 0,null,null,CommonConstants.ONE_INT);
 				}
 				// 同步更新人员档案和项目档案的社保公积金状态
 				updateDocSocialFund(social, fund, socialFund,excel);
@@ -3126,7 +3132,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							&& CommonConstants.ONE_INT == flag){
 						// 更新预估数据 -- 失败项重新派单审核不通过不处理预估
 						if (!flagTemp){
-							forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
+							socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 						}
 						// 更新人员档案和项目档案的社保公积金状态
 						UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
@@ -3386,13 +3392,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										if (Common.isNotNull(libraryFundInfoList)) {
 											for (TForecastLibrary library :libraryFundInfoList) {
 												//办理成功生成收入
-												createIncomeInfo(library);
+												socialTask.asynchronousDisPatchHandle(null,0,null,library,CommonConstants.THREE_INT);
 												if (CommonConstants.ZERO_INT == library.getDataPush()) {
 													libraryFundInfoList1.add(library);
 												}
 											}
 											if (Common.isNotNull(libraryFundInfoList1)) {
-												forecastLibraryService.pushForecastFundInfo(libraryFundInfoList1);
+												socialTask.asynchronousDisPatchHandle(null,0,libraryFundInfoList1,null,CommonConstants.TWO_INT);
 											}
 										}
 									}
@@ -3571,21 +3577,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									&& (CommonConstants.FIVE_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.FOUR_STRING.equals(sf.getFundStatus()))){
 								// 派增办理，全部失败 同步预估库数据
-								forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
+								socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 							}
 							// 社保办理只要办理成功就刷新预估数据  公积金办理不用处理
 							if (Common.isNotNull(dis.getSocialId())
 									&& CommonConstants.FOUR_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.TWO_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.THREE_STRING.equals(sf.getSocialStatus())){
-								forecastLibraryService.updateForecastLibaryByDispatch(sf);
+								socialTask.asynchronousDisPatchHandle(sf, 0,null,null,CommonConstants.ONE_INT);
 							}
 						}
 						//  2.派减办理成功  处理预估 (不管社保还是公积金办理失败)
 						if (CommonConstants.ONE_STRING.equals(dis.getType())
 								&& CommonConstants.ZERO_INT == flag){
 							// 同步预估库数据
-							forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
+							socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 						}
 						// 派减办理失败不同步档案的相关字段信息
 						if (!(CommonConstants.ONE_STRING.equals(dis.getType()) && CommonConstants.ONE_INT == flag)){
@@ -4251,90 +4257,4 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		return minStartDate;
 	}
-
-	public void createIncomeInfo(TForecastLibrary library) {
-		//获取项目信息
-		TSettleDomain settleDomain = new TSettleDomain();
-		List<TSettleDomainSelectVo> settleDomainR = null;
-		R<TSettleDomainListVo> listVo = null;
-		listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
-		if (Common.isNotNull(listVo)) {
-			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
-			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
-				settleDomainR = tSettleDomainListVo.getListSelectVO();
-				for (TSettleDomainSelectVo vo :settleDomainR) {
-					BeanUtils.copyProperties(vo,settleDomain);
-				}
-			}
-		}
-
-		//判断是否存在当月的公积金收入数据
-		boolean isExist = false;
-		TIncomeDetail incomeDetail = new TIncomeDetail();
-		incomeDetail.setEmpIdcard(library.getEmpIdcard());
-		incomeDetail.setPayMonth(library.getProvidentPayMonth());
-		incomeDetail.setDeptNo(library.getDeptNo());
-		incomeDetail.setSourceType(CommonConstants.TWO_STRING);
-		List<TIncomeDetail> detailList = detailService.getTIncomeDetailList(incomeDetail);
-		if (Common.isNotNull(detailList)) {
-			BigDecimal sumMoney = BigDecimal.ZERO;
-			for (TIncomeDetail income : detailList) {
-				sumMoney = BigDecimalUtils.safeAdd(income.getMoney(),sumMoney);
-			}
-			if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
-				isExist = true;
-			}
-		}
-
-		if (Common.isNotNull(settleDomain)) {
-			// 含有社保，则计算收入
-			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()
-					.contains(CommonConstants.TWO_STRING) && !isExist &&
-					CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-				//预估模式
-				//预估模式只有按人次和人数收费
-				createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
-						settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
-						settleDomain.getManagementFee());
-			}
-			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
-					.contains(CommonConstants.TWO_STRING) && !isExist &&
-					CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-				//预估模式
-				createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
-						settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
-						settleDomain.getRiskFundFee());
-			}
-		}
-	}
-
-	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
-									  String charges, String feeMode, BigDecimal money) {
-		//生成收入数据
-		TIncomeDetail detail = new TIncomeDetail();
-		detail.setCreateTime(DateUtil.getCurrentDateTime());
-		detail.setDeptName(settleDomain.getDepartName());
-		detail.setDeptNo(settleDomain.getDepartNo());
-		detail.setDeptId(settleDomain.getId());
-		detail.setEmpIdcard(library.getEmpIdcard());
-		detail.setEmpName(library.getEmpName());
-		detail.setUnitNo(settleDomain.getCustomerNo());
-		detail.setUnitId(settleDomain.getCustomerId());
-		detail.setUnitName(settleDomain.getCustomerName());
-		detail.setDataCreateMonth(DateUtil.addMonth(0));
-		detail.setSourceId(library.getId());
-		detail.setSourceType(CommonConstants.TWO_STRING);
-		detail.setCreateMonth(library.getProvidentCreateMonth());
-		detail.setPayMonth(library.getProvidentPayMonth());
-		detail.setMoney(money);
-		detail.setFeeType(feeType);
-		detail.setFeeMode(feeMode);
-		detail.setCharges(charges);
-		detail.setMrSettleType(settleDomain.getMrSettleType());
-		detail.setRedData(CommonConstants.ZERO_STRING);
-		detail.setId(CommonConstants.NULL);
-		incomeService.saveDetail(detail);
-	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -251,8 +251,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	 * @Date: 2022/8/31 16:34
 	 * @return: boolean
 	 **/
-	@Override
-	public boolean saveDetail(TIncomeDetail tIncomeDetail) {
+	public boolean saveDetail(TIncomeDetail tIncomeDetail,boolean synFlag) {
 		if (Common.isEmpty(tIncomeDetail.getEmpIdcard())
 				|| Common.isEmpty(tIncomeDetail.getDeptId())
 				|| Common.isEmpty(tIncomeDetail.getPayMonth())) {
@@ -274,10 +273,10 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		tIncomeDetailService.save(tIncomeDetail);
 		// 不存在，直接新增
 		if (incomeList == null || incomeList.isEmpty()) {
-			return this.saveIncome(tIncomeDetail);
+			return this.saveIncome(tIncomeDetail,synFlag);
 		} else {
 			// 核心判断
-			return this.copyCore(tIncomeDetail, incomeList, detailList,null);
+			return this.copyCore(tIncomeDetail, incomeList, detailList,null,synFlag);
 		}
 	}
 
@@ -313,7 +312,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 			return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 		} else {
 			// 核心判断
-			return this.copyCore(tIncomeDetail, incomeList, detailList,paymentInfo);
+			return this.copyCore(tIncomeDetail, incomeList, detailList,paymentInfo,true);
 		}
 	}
 
@@ -401,14 +400,18 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	}
 
 	// 复制并保存
-	private boolean saveIncome(TIncomeDetail tIncomeDetail) {
+	private boolean saveIncome(TIncomeDetail tIncomeDetail,boolean synFlag) {
 		TIncome income = new TIncome();
 		BeanUtil.copyProperties(tIncomeDetail, income);
 		income.setSendStatus(CommonConstants.ZERO_STRING);
 		income.setApplyNo(tIncomeDetail.getApplyNo());
 		this.save(income);
 		long start = System.currentTimeMillis();
-		doJointSocialTask.asynchronousEkpIncome(income);
+		if (synFlag){
+			doJointSocialTask.asynchronousEkpIncome(income);
+		}else {
+			doJointSocialTask.asynchronousEkpIncomeAsso(income);
+		}
 		log.error("线程执行耗时："+  (System.currentTimeMillis()-start));
 		return true;
 	}
@@ -571,13 +574,24 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	 * @return: boolean
 	 **/
 	private boolean copyCore(TIncomeDetail tIncomeDetail, List<TIncome> incomeList, List<TIncomeDetail> detailList,
-							 TPaymentInfo paymentInfo) {
+							 TPaymentInfo paymentInfo,boolean synFlag) {
+		if (Common.isNotNull(tIncomeDetail.getSourceId())) {
+			// 如果该id、该类型的金额已存在，则不允许重复生成推送
+			TIncomeDetail a = new TIncomeDetail();
+			a.setSourceId(tIncomeDetail.getSourceId());
+			a.setMoney(tIncomeDetail.getMoney());
+			a.setRedData(tIncomeDetail.getRedData());
+			List<TIncomeDetail> aList = tIncomeDetailService.getTIncomeDetailList(a);
+			if (aList != null && !aList.isEmpty()) {
+				return true;
+			}
+		}
 		// 判断，比例，直接加
 		if (CommonConstants.ONE_STRING.equals(tIncomeDetail.getFeeMode())) {
 			if (Common.isNotNull(paymentInfo)) {
 				return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 			} else {
-				return this.saveIncome(tIncomeDetail);
+				return this.saveIncome(tIncomeDetail,synFlag);
 			}
 		} else {
 			Map<String, Integer> numMap = new HashMap<>();
@@ -633,7 +647,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 						if (Common.isNotNull(paymentInfo)) {
 							return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 						} else {
-							return this.saveIncome(tIncomeDetail);
+							return this.saveIncome(tIncomeDetail,synFlag);
 						}
 					}
 				} else {
@@ -642,7 +656,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 						if (Common.isNotNull(paymentInfo)) {
 							return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 						} else {
-							return this.saveIncome(tIncomeDetail);
+							return this.saveIncome(tIncomeDetail,synFlag);
 						}
 					}
 				}
@@ -655,7 +669,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 							if (Common.isNotNull(paymentInfo)) {
 								return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 							} else {
-								return this.saveIncome(tIncomeDetail);
+								return this.saveIncome(tIncomeDetail,synFlag);
 							}
 						}
 					} else {
@@ -663,13 +677,13 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 							if (Common.isNotNull(paymentInfo)) {
 								return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 							} else {
-								return this.saveIncome(tIncomeDetail);
+								return this.saveIncome(tIncomeDetail,synFlag);
 							}
 						}
 					}
 				} else {
 					// 各个模式累加逻辑：
-					return this.judgeMixModel(tIncomeDetail, numMap, incomeMap);
+					return this.judgeMixModel(tIncomeDetail, numMap, incomeMap,synFlag);
 				}
 			} else {
 				// 薪资。收费方式：2金额-人数
@@ -679,13 +693,13 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 						if (Common.isNotNull(paymentInfo)) {
 							return this.savePaymentIncome(tIncomeDetail,paymentInfo);
 						} else {
-							return this.saveIncome(tIncomeDetail);
+							return this.saveIncome(tIncomeDetail,synFlag);
 						}
 					}
 				} else {
 					// 3金额-人次
 					// 各个模式累加逻辑：
-					return this.judgeMixModel(tIncomeDetail, numMap, incomeMap);
+					return this.judgeMixModel(tIncomeDetail, numMap, incomeMap,synFlag);
 				}
 			}
 		}
@@ -742,7 +756,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	 * @Date: 2022/9/1 18:17
 	 * @return: boolean
 	 **/
-	private boolean judgeMixModel(TIncomeDetail tIncomeDetail, Map<String, Integer> numMap, Map<String, Integer> incomeMap) {
+	private boolean judgeMixModel(TIncomeDetail tIncomeDetail, Map<String, Integer> numMap, Map<String, Integer> incomeMap,boolean synFlag) {
 		String month = tIncomeDetail.getPayMonth();
 		if (CommonConstants.THREE_STRING.equals(tIncomeDetail.getSourceType())) {
 			month = tIncomeDetail.getDataCreateMonth();
@@ -753,11 +767,11 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 			Integer maxNum = incomeMap.get(month + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType());
 			// 当明细的次数大于总次数，才可以新增统计
 			if (Common.isEmpty(maxNum) || ifNullToZero(nums) >= maxNum) {
-				return this.saveIncome(tIncomeDetail);
+				return this.saveIncome(tIncomeDetail,synFlag);
 			}
 		} else {
 			// 红冲判断：当本类型是最大值，才可以红冲
-			if (this.redDateJudge(tIncomeDetail, numMap)) return this.saveIncome(tIncomeDetail);
+			if (this.redDateJudge(tIncomeDetail, numMap)) return this.saveIncome(tIncomeDetail,synFlag);
 		}
 		return true;
 	}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java

@@ -102,6 +102,44 @@ public class DoJointSocialTask {
         }
         log.info("推送收入到EKP结束");
     }
+	public void asynchronousEkpIncomeAsso(TIncome income) {
+		log.info("推送收入到EKP-线程开始");
+		try {
+			String sendBack = this.getSendBack(income);
+			if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
+				sendBack = this.getSendBack(income);
+			}
+			income.setSendTime(new Date());
+			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+				income.setSendStatus(CommonConstants.ONE_STRING);
+				income.setSendMonth(DateUtil.addMonth(0));
+				income.setEkpId(sendBack);
+				incomeMapper.updateById(income);
+			} else {
+				TSendEkpError error = new TSendEkpError();
+				error.setCreateTime(new Date());
+				error.setCreateDay(DateUtil.getThisDay());
+				error.setType(CommonConstants.FOUR_STRING);
+				error.setCreateUserName("收入表推送");
+				error.setLinkId(income.getId());
+				error.setTitle(sendBack);
+				error.setNums(CommonConstants.ONE_INT);
+				tSendEkpErrorService.saveError(error);
+			}
+		} catch (Exception e) {
+			TSendEkpError error = new TSendEkpError();
+			error.setCreateTime(new Date());
+			error.setCreateDay(DateUtil.getThisDay());
+			error.setType(CommonConstants.FOUR_STRING);
+			error.setCreateUserName("收入表推送");
+			error.setLinkId(income.getId());
+			error.setTitle(e.getMessage());
+			error.setNums(CommonConstants.ONE_INT);
+			tSendEkpErrorService.saveError(error);
+			log.error("推送收入到EKP错误", e);
+		}
+		log.info("推送收入到EKP结束");
+	}
 
 	/**
 	 * @Description: 合同-批量更换负责人
@@ -401,6 +439,13 @@ public class DoJointSocialTask {
 	 **/
 	@Async
 	public void asynchronousEkpForecastSocial(EkpPushSocialParam socialParam, TForecastLibrary library) {
+		ekpForecastSocial(socialParam, library);
+	}
+	public void asynchronousEkpForecastSocialAsso(EkpPushSocialParam socialParam, TForecastLibrary library) {
+		ekpForecastSocial(socialParam, library);
+	}
+
+	private void ekpForecastSocial(EkpPushSocialParam socialParam, TForecastLibrary library) {
 		log.info("推送社保预估费用到EKP-线程开始");
 		try {
 			String body = ekpSocialUtil.sendToEKP(socialParam);
@@ -444,6 +489,11 @@ public class DoJointSocialTask {
 	 **/
 	@Async
 	public void asynchronousEkpForecastFund(EkpPushFundParam fundParam, TForecastLibrary library) {
+		initEkpForecastFund(fundParam, library);
+	}
+
+	private void initEkpForecastFund(EkpPushFundParam fundParam, TForecastLibrary library) {
+		initEkpForecastFund(fundParam, library);
 		log.info("推送公积金预估费用到EKP-线程开始");
 		try {
 			String body = ekpFundUtil.sendToEKP(fundParam);
@@ -478,4 +528,8 @@ public class DoJointSocialTask {
 		}
 		log.info("推送公积金预估费用到EKP结束");
 	}
+
+	public void asynchronousEkpForecastFundAsso(EkpPushFundParam fundParam, TForecastLibrary library) {
+		initEkpForecastFund(fundParam, library);
+	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoSocialTask.java

+package com.yifu.cloud.plus.v1.yifu.social.util;
+
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TSendEkpErrorMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author fxj
+ * @Date 2022/11/28
+ * @Description  批量办理异步处理
+ * @Version 1.0
+ */
+@Slf4j
+@Component
+public class DoSocialTask {
+	@Autowired
+	private TForecastLibraryService forecastLibraryService;
+
+	@Autowired
+	private TIncomeDetailService detailService;
+
+	@Autowired
+	private ArchivesDaprUtil archivesDaprUtil;
+
+	@Autowired
+	private TIncomeService incomeService;
+
+	@Autowired
+	private TSendEkpErrorMapper sendEkpErrorMapper;
+	/**
+	 * @Author fxj
+	 * @Description 异步处理相关信息
+	 * @Date 11:23 2022/11/28
+	 * @param type=0 updateForecastLibaryByDispatchReduce   type=1 updateForecastLibaryByDispatch  type=2 pushForecastFundInfo   createIncomeInfo(library);
+	 **/
+	@Async
+	public void asynchronousDisPatchHandle(TSocialFundInfo sf, int forecastFlag,List< TForecastLibrary > libs,TForecastLibrary library,int type) {
+		synchronized (this){
+			R<String> res;
+			String linkId = null;
+			try {
+				// 派单减少变更预估库-派减
+				if (type == CommonConstants.ZERO_INT){
+					linkId = sf.getId();
+					res = forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
+					if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
+						initSendError(library.getId(), res.getMsg(),"updateForecastLibaryByDispatchReduce:");
+					}
+				}
+				// 派单变更预估库
+				if (type == CommonConstants.ONE_INT){
+					linkId = sf.getId();
+					res  = forecastLibraryService.updateForecastLibaryByDispatch(sf);
+					if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
+						initSendError(sf.getId(), res.getMsg(),"updateForecastLibaryByDispatch:");
+					}
+				}
+				// 获取预估库数据并推送
+				if (type == CommonConstants.TWO_INT){
+					if (Common.isNotNull(libs)){
+						for (TForecastLibrary lib:libs){
+							if (Common.isEmpty(linkId)){
+								linkId = lib.getId();
+							}else {
+								linkId = linkId + CommonConstants.COMMA_CHAR + lib.getId();
+							}
+						}
+					}
+					forecastLibraryService.pushForecastFundInfo(libs,false);
+				}
+				// 获取预估库数据并推送
+				if (type == CommonConstants.THREE_INT){
+					linkId = library.getId();
+					createIncomeInfo(library);
+				}
+			}catch (Exception e){
+				initSendError(linkId, e.getMessage(),"asynchronousDisPatchHandle:");
+			}
+		}
+	}
+
+	private void initSendError(String linkId, String msg,String title) {
+		TSendEkpError error = new TSendEkpError();
+		error.setCreateTime(new Date());
+		error.setCreateDay(DateUtil.getThisDay());
+		error.setType(CommonConstants.TWO_STRING);
+		error.setCreateUserName("社保预估费用推送");
+		error.setLinkId(linkId);
+		error.setTitle(title+ msg);
+		error.setNums(CommonConstants.ONE_INT);
+		this.saveError(error);
+		log.error("推送社保预估费用到EKP错误", msg);
+	}
+
+	private boolean saveError(TSendEkpError tSendEkpError) {
+		// 类型、创建日不可为空
+		if (Common.isEmpty(tSendEkpError.getType()) || Common.isEmpty(tSendEkpError.getCreateDay())) {
+			return false;
+		}
+		TSendEkpError error = sendEkpErrorMapper.getByTitleTypeDay(tSendEkpError);
+		if (error == null) {
+			return sendEkpErrorMapper.insert(tSendEkpError) > 0;
+		} else {
+			if (Common.isEmpty(tSendEkpError.getNums())) {
+				tSendEkpError.setNums(CommonConstants.ONE_INT);
+			}
+			error.setNums(error.getNums() + tSendEkpError.getNums());
+			return sendEkpErrorMapper.updateById(error) >= 0;
+		}
+	}
+	public void createIncomeInfo(TForecastLibrary library) {
+		//获取项目信息
+		TSettleDomain settleDomain = new TSettleDomain();
+		List<TSettleDomainSelectVo> settleDomainR = null;
+		R<TSettleDomainListVo> listVo = null;
+		listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
+		if (Common.isNotNull(listVo)) {
+			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
+			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
+				settleDomainR = tSettleDomainListVo.getListSelectVO();
+				for (TSettleDomainSelectVo vo :settleDomainR) {
+					BeanUtils.copyProperties(vo,settleDomain);
+				}
+			}
+		}
+
+		//判断是否存在当月的公积金收入数据
+		boolean isExist = false;
+		TIncomeDetail incomeDetail = new TIncomeDetail();
+		incomeDetail.setEmpIdcard(library.getEmpIdcard());
+		incomeDetail.setPayMonth(library.getProvidentPayMonth());
+		incomeDetail.setDeptNo(library.getDeptNo());
+		incomeDetail.setSourceType(CommonConstants.TWO_STRING);
+		List<TIncomeDetail> detailList = detailService.getTIncomeDetailList(incomeDetail);
+		if (Common.isNotNull(detailList)) {
+			BigDecimal sumMoney = BigDecimal.ZERO;
+			for (TIncomeDetail income : detailList) {
+				sumMoney = BigDecimalUtils.safeAdd(income.getMoney(),sumMoney);
+			}
+			if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
+				isExist = true;
+			}
+		}
+
+		if (Common.isNotNull(settleDomain)) {
+			// 含有社保，则计算收入
+			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()
+					.contains(CommonConstants.TWO_STRING) && !isExist &&
+					CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+				//预估模式
+				//预估模式只有按人次和人数收费
+				createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
+						settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
+						settleDomain.getManagementFee());
+			}
+			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
+					.contains(CommonConstants.TWO_STRING) && !isExist &&
+					CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+				//预估模式
+				createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
+						settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
+						settleDomain.getRiskFundFee());
+			}
+		}
+	}
+
+	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
+									  String charges, String feeMode, BigDecimal money) {
+		//生成收入数据
+		TIncomeDetail detail = new TIncomeDetail();
+		detail.setCreateTime(DateUtil.getCurrentDateTime());
+		detail.setDeptName(settleDomain.getDepartName());
+		detail.setDeptNo(settleDomain.getDepartNo());
+		detail.setDeptId(settleDomain.getId());
+		detail.setEmpIdcard(library.getEmpIdcard());
+		detail.setEmpName(library.getEmpName());
+		detail.setUnitNo(settleDomain.getCustomerNo());
+		detail.setUnitId(settleDomain.getCustomerId());
+		detail.setUnitName(settleDomain.getCustomerName());
+		detail.setDataCreateMonth(DateUtil.addMonth(0));
+		detail.setSourceId(library.getId());
+		detail.setSourceType(CommonConstants.TWO_STRING);
+		detail.setCreateMonth(library.getProvidentCreateMonth());
+		detail.setPayMonth(library.getProvidentPayMonth());
+		detail.setMoney(money);
+		detail.setFeeType(feeType);
+		detail.setFeeMode(feeMode);
+		detail.setCharges(charges);
+		detail.setMrSettleType(settleDomain.getMrSettleType());
+		detail.setRedData(CommonConstants.ZERO_STRING);
+		detail.setId(CommonConstants.NULL);
+
+		// 批量办理成功 收入不异步推送
+		incomeService.saveDetail(detail,false);
+	}
+}