Merge remote-tracking branch 'origin/develop' into develop

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

@@ -154,6 +154,11 @@ public interface CommonConstants {
 	 */
 	int ZERO_INT = 0;
 
+	/**
+	 * number 5000
+	 */
+	int FIVES_INT = 5000;
+
 	/**
 	 * number 1
 	 */

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -1127,7 +1127,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							try{
 								updateInsuranceInfo(detail,settle);
 							}catch (Exception e){
-								// todo 异常处理
 								log.error("收入数据同步处理失败："+e);
 							}
 
@@ -1332,8 +1331,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							detail.setIsUse(CommonConstants.ZERO_INT);
 							detail.setUpdateTime(LocalDateTime.now());
 							successList.add(detail);
-							//生成收入数据
-							createInsuranceInfo(detail);
 						}
 					}
 				}
@@ -1612,6 +1609,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				//可以改成批量更新
 				this.updateById(detail);
 				detailList.add(detail);
+				try {
+					if (detail.getBuyType() != CommonConstants.FOUR_INT) {
+						//生成收入数据
+						createInsuranceInfo(detail);
+					}
+				}catch (Exception e){
+					log.error("收入数据同步处理失败："+e);
+				}
 			}
 		}
 		//操作记录
@@ -3738,6 +3743,30 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							.set(TInsuranceDetail :: getUpdateTime,LocalDateTime.now());
 				//更新项目编码
 				update(updateWrapper);
+				//更换项目更新收入
+				TInsuranceDetail income = getOne(lambdaQuery().getWrapper().eq(TInsuranceDetail::getId, success.getId()));
+				if (Common.isNotNull(income)) {
+					if (income.getBuyType() != CommonConstants.FOUR_INT) {
+						//判断是否存在当月的商险收入数据
+						TIncomeDetail incomeDetail = new TIncomeDetail();
+						incomeDetail.setSourceId(income.getId());
+						R<TIncomeDetailReturnVo> detailList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
+						if (Common.isNotNull(detailList) && detailList.getCode() == CommonConstants.SUCCESS
+								&& detailList.getData().getDetailList().size() > 0) {
+							//原项目生成红冲数据
+							for (TIncomeDetail detail : detailList.getData().getDetailList()) {
+								TIncomeDetail detail1 = new TIncomeDetail();
+								BeanCopyUtils.copyProperties(detail,detail1);
+								detail1.setId(CommonConstants.NULL);
+								detail1.setRedData(CommonConstants.ONE_STRING);
+								detail1.setMoney(detail.getMoney().negate());
+								socialDaprUtils.createTIncomeDetail(detail1);
+							}
+							//新项目下生成收入数据
+							createInsuranceInfo(income);
+						}
+					}
+				}
 				//商险id
 				String insuranceDetailId = success.getId();
 				//旧结算信息id
@@ -5938,8 +5967,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()
 					.contains(CommonConstants.THREE_STRING)) {
 				//预估模式
-				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-					if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						//预估模式只有按人次和人数收费
 						if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
 							isSum = 1;
@@ -5949,20 +5978,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
 									settleDomain.getManagementFee());
 						}
-					}
-				} else {
-					BigDecimal gMoney = BigDecimal.ZERO;
-					if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
-					} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
-						isSum = 2;
 					} else {
-						gMoney = BigDecimalUtils.safeMultiply(insuranceDetail.getActualPremium(),settleDomain.getManagementFee());
-					}
-					if (!isExist || isSum ==2) {
-						createIncomeInsurance(insuranceDetail, settleDomain, CommonConstants.ONE_STRING,
-								settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), gMoney);
+						BigDecimal gMoney = BigDecimal.ZERO;
+						if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+						} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+							isSum = 2;
+						} else {
+							gMoney = BigDecimalUtils.safeMultiply(insuranceDetail.getActualPremium(),
+									settleDomain.getManagementFee().divide(new BigDecimal("100"),
+											CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
+						}
+						if (!isExist || isSum == 2) {
+							createIncomeInsurance(insuranceDetail, settleDomain, CommonConstants.ONE_STRING,
+									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), gMoney);
+						}
 					}
 				}
 			}
@@ -5988,7 +6019,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							money = settleDomain.getRiskFundFee();
 							isSum = 4;
 						} else {
-							money = BigDecimalUtils.safeMultiply(insuranceDetail.getActualPremium(), settleDomain.getRiskFundFee());
+							money = BigDecimalUtils.safeMultiply(insuranceDetail.getActualPremium(),
+									settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
+											CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
 						}
 						if (!isExist || isSum == 4) {
 							createIncomeInsurance(insuranceDetail, settleDomain, CommonConstants.TWO_STRING,

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

@@ -287,14 +287,4 @@ public class TForecastLibraryController {
 	public void createForecastFundInfo() {
 		tForecastLibraryService.createForecastFundInfo();
 	}
-
-	@PostMapping("/createFundInfo")
-	public void createFundInfo() {
-		tForecastLibraryService.createForecastFundInfo();
-	}
-
-	@PostMapping("/createSocialInfo")
-	public void createSocialInfo() {
-		tForecastLibraryService.createForecastInfo();
-	}
 }

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

@@ -341,16 +341,6 @@ public class TPaymentInfoController {
 		tPaymentInfoService.createPaymentFundInfo();
 	}
 
-	@PostMapping("/createFundInfo")
-	public void createFundInfo() {
-		tPaymentInfoService.createPaymentFundInfo();
-	}
-
-	@PostMapping("/createSocialInfo")
-	public void createSocialInfo() {
-		tPaymentInfoService.createPaymentSocialInfo();
-	}
-
 	/**
 	 * @Description: 定时生成缴费库的收入数据
 	 * @Author: huyc

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java

@@ -55,4 +55,6 @@ public interface TIncomeMapper extends BaseMapper<TIncome> {
 
     List<TIncome> getTIncomeList(@Param("tIncome") TIncome tIncome);
 
+	void updateIncomeById(@Param("list") List<TIncome> list);
+
 }

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

@@ -4052,27 +4052,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()
 					.contains(CommonConstants.TWO_STRING)) {
 				//预估模式
-				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-					if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						//预估模式只有按人次和人数收费
 						if (!isExist) {
 							createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
 									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
 									settleDomain.getManagementFee());
 						}
-					}
-				} else {
-					BigDecimal gMoney = BigDecimal.ZERO;
-					if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
-					} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
 					} else {
-						gMoney = BigDecimalUtils.safeMultiply(library.getSumAll(),settleDomain.getManagementFee());
-					}
-					if (!isExist) {
-						createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
-								settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), gMoney);
+						BigDecimal gMoney = BigDecimal.ZERO;
+						if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+						} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+						} else {
+							gMoney = BigDecimalUtils.safeMultiply(library.getSumAll(),
+									settleDomain.getManagementFee().divide(new BigDecimal("100"),
+											CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
+						}
+						if (!isExist) {
+							createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
+									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), gMoney);
+						}
 					}
 				}
 			}
@@ -4094,7 +4096,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
 							money = settleDomain.getRiskFundFee();
 						} else {
-							money = BigDecimalUtils.safeMultiply(library.getSumAll(), settleDomain.getRiskFundFee());
+							money = BigDecimalUtils.safeMultiply(library.getSumAll(),
+									settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
+											CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
 						}
 						if (!isExist) {
 							createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,

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

@@ -50,11 +50,13 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper;
 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.service.TSendEkpErrorService;
 import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
@@ -92,6 +94,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 
 	private final ArchivesDaprUtil archivesDaprUtil;
 
+	private final TSendEkpErrorService tSendEkpErrorService;
+
 	/**
 	 * 预估费用简单分页查询
 	 *
@@ -328,6 +332,31 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					isSaveAndUpdate = true;
 				}
 			}
+			//生成社保收入
+			TSocialFundInfo socialFundInfo = socialFundInfoMapper.selectOne(Wrappers.<TSocialFundInfo>query().lambda()
+							.eq(TSocialFundInfo::getEmpIdcard, empIdCard)
+							.eq(TSocialFundInfo::getSettleDomain, library.getSettleDomainId())
+							.eq(TSocialFundInfo::getSocialHousehold, library.getSocialHousehold()));
+			if (Common.isNotNull(socialFundInfo)) {
+				if (Common.isNotNull(socialFundInfo.getSocialId())
+						&& CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus())
+						|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) {
+					//办理成功生成收入
+					createIncomeInfo(library);
+				}
+			}
+			//生成公积金收入
+			TSocialFundInfo socialFundInfoF = socialFundInfoMapper.selectOne(Wrappers.<TSocialFundInfo>query().lambda()
+					.eq(TSocialFundInfo::getEmpIdcard, empIdCard)
+					.eq(TSocialFundInfo::getSettleDomain, library.getSettleDomainId())
+					.eq(TSocialFundInfo::getProvidentHousehold, library.getProvidentHousehold()));
+			if (Common.isNotNull(socialFundInfoF)) {
+				if (Common.isNotNull(socialFundInfoF.getFundId())
+						&& CommonConstants.THREE_STRING.equals(socialFundInfoF.getFundStatus())) {
+					//办理成功生成收入
+					createIncomeInfo(library);
+				}
+			}
 		}
 		if (isSaveAndUpdate) {
 			return R.ok(null, "执行成功！");
@@ -2154,17 +2183,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			isSaveAndUpdate = true;
 		}
 
-		if (Common.isNotNull(socialFundInfo.getSocialId())
+		if ((Common.isNotNull(socialFundInfo.getSocialId())
 				&& CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus())
-				|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) {
+				|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus()))
+				|| (Common.isNotNull(socialFundInfo.getFundId())
+				&& CommonConstants.THREE_STRING.equals(socialFundInfo.getFundStatus()))) {
 
 			//获取所有的预估数据
 			List<TForecastLibrary> librarySocialInfoList = null;
 			librarySocialInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
 					.eq(TForecastLibrary::getEmpIdcard, empIdCard)
-					.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)
 					.eq(TForecastLibrary::getSettleDomainId, socialFundInfo.getSettleDomain())
-					.in(TForecastLibrary::getSocialPayMonth, payMonthList));
+					.and(obj -> obj
+							.in(TForecastLibrary::getSocialPayMonth, payMonthList)
+							.or()
+							.in(TForecastLibrary::getProvidentPayMonth, payMonthList))
+			);
+
 			if (Common.isNotNull(librarySocialInfoList)) {
 				for (TForecastLibrary library : librarySocialInfoList) {
 					//办理成功生成收入
@@ -2234,11 +2269,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT));
 		if (Common.isNotNull(unPushInfo)) {
 			//推送数据封装并推送
-			List<String> pushList = initEkpPushSocialParam(unPushInfo);
-			//更新推送状态
-			if (Common.isNotNull(pushList)) {
-				baseMapper.updatePushStatus(pushList);
-			}
+			initEkpPushSocialParam(unPushInfo);
 		}
 	}
 
@@ -2250,16 +2281,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT));
 		if (Common.isNotNull(unPushInfo)) {
 			//推送数据封装并推送
-			List<String> pushList = initEkpPushFundParam(unPushInfo);
-			//更新推送状态
-			if (Common.isNotNull(pushList)) {
-				baseMapper.updatePushStatus(pushList);
-			}
+			initEkpPushFundParam(unPushInfo);
 		}
 	}
 
-	public List<String> initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) {
+	public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) {
 		List<String> pushList = new ArrayList<>();
+		Map<String,Integer> map = new HashMap<>();
 		for (TForecastLibrary library : unPushInfo) {
 			//获取项目信息
 			TSettleDomain settleDomain = new TSettleDomain();
@@ -2481,16 +2509,62 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			socialParam.setFd_3b0afbe1f94a08(library.getId());
 
 			String body = ekpSocialUtil.sendToEKP(socialParam);
-			if (Common.isNotNull(body)) {
+			if (Common.isNotNull(body) && body.length() == 32) {
 				//更新推送状态为已推送的列表
 				pushList.add(library.getId());
+				if (pushList.size() >= CommonConstants.FIVES_INT) {
+					baseMapper.updatePushStatus(pushList);
+					pushList.clear();
+				}
+			}else {
+				if (map.get(body) > 0) {
+					int i = map.get(body) + 1;
+					map.put(body,i);
+					//单个异常超过十次，保存异常内容
+					if (i >= 10) {
+						baseMapper.updatePushStatus(pushList);
+						for (String key: map.keySet()) {
+							TSendEkpError error = new TSendEkpError();
+							error.setCreateTime(new Date());
+							error.setCreateDay(DateUtil.getThisDay());
+							error.setType(CommonConstants.TWO_STRING);
+							error.setLinkId(library.getId());
+							error.setTitle(key);
+							error.setNums(map.get(key));
+							tSendEkpErrorService.saveError(error);
+						}
+						break;
+					}
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.TWO_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(i);
+					tSendEkpErrorService.saveError(error);
+				} else {
+					map.put(body,1);
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.TWO_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(1);
+					tSendEkpErrorService.saveError(error);
+				}
 			}
 		}
-		return pushList;
+		//更新推送状态
+		if (Common.isNotNull(pushList)) {
+			baseMapper.updatePushStatus(pushList);
+		}
 	}
 
-	public List<String> initEkpPushFundParam(List<TForecastLibrary> unPushInfo) {
+	public void initEkpPushFundParam(List<TForecastLibrary> unPushInfo) {
 		List<String> pushList = new ArrayList<>();
+		Map<String,Integer> map = new HashMap<>();
 		for (TForecastLibrary library : unPushInfo) {
 			//获取项目信息
 			TSettleDomain settleDomain = new TSettleDomain();
@@ -2608,12 +2682,57 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			fundParam.setFd_3b0afbaf10df2c(library.getId());
 
 			String body = ekpFundUtil.sendToEKP(fundParam);
-			if (Common.isNotNull(body)) {
+			if (Common.isNotNull(body) && body.length() == 32) {
 				//更新推送状态为已推送的列表
 				pushList.add(library.getId());
+				if (pushList.size() >= CommonConstants.FIVES_INT) {
+					baseMapper.updatePushStatus(pushList);
+					pushList.clear();
+				}
+			}else {
+				if (map.get(body) > 0) {
+					int i = map.get(body) + 1;
+					map.put(body,i);
+					//单个异常超过十次，保存异常内容
+					if (i >= 10) {
+						baseMapper.updatePushStatus(pushList);
+						for (String key: map.keySet()) {
+							TSendEkpError error = new TSendEkpError();
+							error.setCreateTime(new Date());
+							error.setCreateDay(DateUtil.getThisDay());
+							error.setType(CommonConstants.TWO_STRING);
+							error.setLinkId(library.getId());
+							error.setTitle(key);
+							error.setNums(map.get(key));
+							tSendEkpErrorService.saveError(error);
+						}
+						break;
+					}
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.TWO_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(i);
+					tSendEkpErrorService.saveError(error);
+				} else {
+					map.put(body,1);
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.TWO_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(1);
+					tSendEkpErrorService.saveError(error);
+				}
 			}
 		}
-		return pushList;
+		//更新推送状态
+		if (Common.isNotNull(pushList)) {
+			baseMapper.updatePushStatus(pushList);
+		}
 	}
 
 	public void createIncomeInfo(TForecastLibrary library) {
@@ -2667,27 +2786,29 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					&& CommonConstants.ONE_STRING.equals(sourceType)) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
 					&& CommonConstants.TWO_STRING.equals(sourceType)))) {
 				//预估模式
-				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-					if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						if (!isExist) {
 							createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
 									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
 									settleDomain.getManagementFee(), sourceType);
 						}
-					}
-				} else {
-					BigDecimal gMoney;
-					if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
-					} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
 					} else {
-						gMoney = BigDecimalUtils.safeMultiply(library.getSumAll(), settleDomain.getManagementFee());
-					}
-					if (!isExist) {
-						createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
-								settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
-								gMoney, sourceType);
+						BigDecimal gMoney;
+						if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+						} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+						} else {
+							gMoney = BigDecimalUtils.safeMultiply(library.getSumAll(),
+									settleDomain.getManagementFee().divide(new BigDecimal("100"),
+											CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
+						}
+						if (!isExist) {
+							createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
+									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
+									gMoney, sourceType);
+						}
 					}
 				}
 			}
@@ -2710,7 +2831,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 						} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
 							money = settleDomain.getRiskFundFee();
 						} else {
-							money = BigDecimalUtils.safeMultiply(library.getSumAll(), settleDomain.getRiskFundFee());
+							money = BigDecimalUtils.safeMultiply(library.getSumAll(),
+									settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
+											CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
 						}
 						if (!isExist) {
 							createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,

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

@@ -279,6 +279,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		List<TIncome> list = baseMapper.selectList(Wrappers.<TIncome>query().lambda()
 				.eq(TIncome::getSendStatus, CommonConstants.ZERO_STRING));
 		String sendBack;
+		Map<String,Integer> map = new HashMap<>();
+		//收入更新
+		List<TIncome> updateList = new ArrayList<>();
 		for (TIncome income : list) {
 			sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
@@ -286,9 +289,52 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
+				updateList.add(income);
+				if (updateList.size() >= CommonConstants.FIVES_INT) {
+					baseMapper.updateIncomeById(updateList);
+					updateList.clear();
+				}
+			} else {
+				if (map.get(sendBack) > 0) {
+					int i = map.get(sendBack) + 1;
+					map.put(sendBack,i);
+					//单个异常超过十次，保存异常内容
+					if (i >= 10) {
+						baseMapper.updateIncomeById(updateList);
+						for (String key: map.keySet()) {
+							TSendEkpError error = new TSendEkpError();
+							error.setCreateTime(new Date());
+							error.setCreateDay(DateUtil.getThisDay());
+							error.setType(CommonConstants.FIVE_STRING);
+							error.setLinkId(income.getId());
+							error.setTitle(key);
+							error.setNums(map.get(key));
+							tSendEkpErrorService.saveError(error);
+						}
+						break;
+					}
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.THREE_STRING);
+					error.setLinkId(income.getId());
+					error.setTitle(sendBack);
+					error.setNums(i);
+					tSendEkpErrorService.saveError(error);
+				} else {
+					map.put(sendBack,1);
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.THREE_STRING);
+					error.setLinkId(income.getId());
+					error.setTitle(sendBack);
+					error.setNums(1);
+					tSendEkpErrorService.saveError(error);
+				}
 			}
-			this.updateById(income);
 		}
+		baseMapper.updateIncomeById(updateList);
 	}
 
 	/**

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

@@ -55,6 +55,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentHeFeiVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
@@ -125,6 +126,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private ArchivesDaprUtil archivesDaprUtil;
 
+	@Autowired
+	private TSendEkpErrorService tSendEkpErrorService;
+
 	/**
 	 * 缴费库简单分页查询
 	 *
@@ -2228,11 +2232,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				.isNotNull(TPaymentInfo::getSocialId));
 		if (Common.isNotNull(unPushInfo)) {
 			//推送数据封装并推送
-			List<String> pushList = initEkpPushSocialParam(unPushInfo);
-			//更新推送状态
-			if (Common.isNotNull(pushList)) {
-				baseMapper.updatePushStatus(pushList);
-			}
+			initEkpPushSocialParam(unPushInfo);
 		}
 	}
 
@@ -2244,11 +2244,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				.isNotNull(TPaymentInfo::getFundId));
 		if (Common.isNotNull(unPushInfo)) {
 			//推送数据封装并推送
-			List<String> pushList = initEkpPushFundParam(unPushInfo);
-			//更新推送状态
-			if (Common.isNotNull(pushList)) {
-				baseMapper.updatePushStatus(pushList);
-			}
+			initEkpPushFundParam(unPushInfo);
 		}
 	}
 
@@ -2257,7 +2253,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		BigDecimal sumSocial = BigDecimal.ZERO;
 		//判断缴费库中社保合计和本次导入合计相加是否为0，为0则不生成收入
 		List<TPaymentInfo> sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
-				.lt(TPaymentInfo::getCreateTime, LocalDateTimeUtils.getDayStart(LocalDateTime.now()))
+				.between(TPaymentInfo::getCreateTime,LocalDateTimeUtils.getThatDayStartTime(LocalDateTime.now().plusDays(-1)),
+						LocalDateTimeUtils.getDayStart(LocalDateTime.now()))
 				.isNotNull(TPaymentInfo::getSocialId));
 		if (Common.isNotNull(sumList)) {
 			for (TPaymentInfo paymentInfo: sumList) {
@@ -2282,7 +2279,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Override
 	public void createPaymentFundIncome() {
 		List<TPaymentInfo> sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
-				.lt(TPaymentInfo::getCreateTime, LocalDateTimeUtils.getDayStart(LocalDateTime.now()))
+				.between(TPaymentInfo::getCreateTime,LocalDateTimeUtils.getThatDayStartTime(LocalDateTime.now().plusDays(-1)),
+						LocalDateTimeUtils.getDayStart(LocalDateTime.now()))
 				.isNotNull(TPaymentInfo::getFundId));
 		if (Common.isNotNull(sumList)) {
 			for (TPaymentInfo paymentInfo: sumList) {
@@ -2303,8 +2301,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		return paymentVo;
 	}
 
-	public List<String> initEkpPushSocialParam(List<TPaymentInfo> unPushInfo) {
+	public void initEkpPushSocialParam(List<TPaymentInfo> unPushInfo) {
 		List<String> pushList = new ArrayList<>();
+		Map<String,Integer> map = new HashMap<>();
 		for (TPaymentInfo library:unPushInfo) {
 
 			//获取项目信息
@@ -2533,16 +2532,62 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			socialParam.setFd_3b0afbe1f94a08(library.getId());
 
 			String body = ekpSocialUtil.sendToEKP(socialParam);
-			if (Common.isNotNull(body)) {
+			if (Common.isNotNull(body) && body.length() == 32) {
 				//更新推送状态为已推送的列表
 				pushList.add(library.getId());
+				if (pushList.size() >= CommonConstants.FIVES_INT) {
+					baseMapper.updatePushStatus(pushList);
+					pushList.clear();
+				}
+			}else {
+				if (map.get(body) > 0) {
+					int i = map.get(body) + 1;
+					map.put(body,i);
+					//单个异常超过十次，保存异常内容
+					if (i >= 10) {
+						baseMapper.updatePushStatus(pushList);
+						for (String key: map.keySet()) {
+							TSendEkpError error = new TSendEkpError();
+							error.setCreateTime(new Date());
+							error.setCreateDay(DateUtil.getThisDay());
+							error.setType(CommonConstants.THREE_STRING);
+							error.setLinkId(library.getId());
+							error.setTitle(key);
+							error.setNums(map.get(key));
+							tSendEkpErrorService.saveError(error);
+						}
+						break;
+					}
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.THREE_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(i);
+					tSendEkpErrorService.saveError(error);
+				} else {
+					map.put(body,1);
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.THREE_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(1);
+					tSendEkpErrorService.saveError(error);
+				}
 			}
 		}
-		return pushList;
+		//更新推送状态
+		if (Common.isNotNull(pushList)) {
+			baseMapper.updatePushStatus(pushList);
+		}
 	}
 
-	public List<String> initEkpPushFundParam(List<TPaymentInfo> unPushInfo) {
+	public void initEkpPushFundParam(List<TPaymentInfo> unPushInfo) {
 		List<String> pushList = new ArrayList<>();
+		Map<String,Integer> map = new HashMap<>();
 		for (TPaymentInfo library:unPushInfo) {
 			//获取项目信息
 			TSettleDomain settleDomain = new TSettleDomain();
@@ -2662,12 +2707,57 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			fundParam.setFd_3b0afbaf10df2c(library.getId());
 
 			String body = ekpFundUtil.sendToEKP(fundParam);
-			if (Common.isNotNull(body)) {
+			if (Common.isNotNull(body) && body.length() == 32) {
 				//更新推送状态为已推送的列表
 				pushList.add(library.getId());
+				if (pushList.size() >= CommonConstants.FIVES_INT) {
+					baseMapper.updatePushStatus(pushList);
+					pushList.clear();
+				}
+			}else {
+				if (map.get(body) > 0) {
+					int i = map.get(body) + 1;
+					map.put(body,i);
+					//单个异常超过十次，保存异常内容
+					if (i >= 10) {
+						baseMapper.updatePushStatus(pushList);
+						for (String key: map.keySet()) {
+							TSendEkpError error = new TSendEkpError();
+							error.setCreateTime(new Date());
+							error.setCreateDay(DateUtil.getThisDay());
+							error.setType(CommonConstants.THREE_STRING);
+							error.setLinkId(library.getId());
+							error.setTitle(key);
+							error.setNums(map.get(key));
+							tSendEkpErrorService.saveError(error);
+						}
+						break;
+					}
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.THREE_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(i);
+					tSendEkpErrorService.saveError(error);
+				} else {
+					map.put(body,1);
+					TSendEkpError error = new TSendEkpError();
+					error.setCreateTime(new Date());
+					error.setCreateDay(DateUtil.getThisDay());
+					error.setType(CommonConstants.THREE_STRING);
+					error.setLinkId(library.getId());
+					error.setTitle(body);
+					error.setNums(1);
+					tSendEkpErrorService.saveError(error);
+				}
 			}
 		}
-		return pushList;
+		//更新推送状态
+		if (Common.isNotNull(pushList)) {
+			baseMapper.updatePushStatus(pushList);
+		}
 	}
 
 	public void createIncomeInfo(TPaymentInfo paymentInfo,String socialFundFlag) {
@@ -2717,32 +2807,36 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
 					&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
 				//预估模式
-				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-					if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
+					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						//预估模式只有按人次和人数收费
 						if (!exitFlag) {
 							createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.ONE_STRING,
 									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
 									settleDomain.getManagementFee(), socialFundFlag);
 						}
-					}
-				} else {
-					BigDecimal gMoney = BigDecimal.ZERO;
-					if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
-					} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
-						gMoney = settleDomain.getManagementFee();
 					} else {
-						if (CommonConstants.ONE_STRING.equals(socialFundFlag)) {
-							gMoney = BigDecimalUtils.safeMultiply(paymentInfo.getSocialSum(), settleDomain.getManagementFee());
+						BigDecimal gMoney = BigDecimal.ZERO;
+						if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
+						} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
+							gMoney = settleDomain.getManagementFee();
 						} else {
-							gMoney = BigDecimalUtils.safeMultiply(paymentInfo.getProvidentSum(), settleDomain.getManagementFee());
+							if (CommonConstants.ONE_STRING.equals(socialFundFlag)) {
+								gMoney = BigDecimalUtils.safeMultiply(paymentInfo.getSocialSum(),
+										settleDomain.getManagementFee().divide(new BigDecimal("100"),
+												CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
+							} else {
+								gMoney = BigDecimalUtils.safeMultiply(paymentInfo.getProvidentSum(),
+										settleDomain.getManagementFee().divide(new BigDecimal("100"),
+												CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
+							}
+						}
+						if (!exitFlag) {
+							createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.ONE_STRING,
+									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
+									gMoney, socialFundFlag);
 						}
-					}
-					if (!exitFlag) {
-						createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.ONE_STRING,
-								settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
-								gMoney, socialFundFlag);
 					}
 				}
 			}
@@ -2766,9 +2860,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							money = settleDomain.getRiskFundFee();
 						} else {
 							if (CommonConstants.ONE_STRING.equals(socialFundFlag)) {
-								money = BigDecimalUtils.safeMultiply(paymentInfo.getSocialSum(), settleDomain.getRiskFundFee());
+								money = BigDecimalUtils.safeMultiply(paymentInfo.getSocialSum(),
+										settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
+												CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
 							} else {
-								money = BigDecimalUtils.safeMultiply(paymentInfo.getProvidentSum(), settleDomain.getRiskFundFee());
+								money = BigDecimalUtils.safeMultiply(paymentInfo.getProvidentSum(),
+										settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
+												CommonConstants.THREE_INT, BigDecimal.ROUND_HALF_UP));
 							}
 						}
 						if (!exitFlag) {

yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml

@@ -47,6 +47,7 @@
 		<result property="sendStatus" column="SEND_STATUS"/>
 		<result property="sendTime" column="SEND_TIME"/>
 		<result property="sendMonth" column="SEND_MONTH"/>
+		<result property="ekpId" column="EKP_ID"/>
 	</resultMap>
 	<resultMap id="incomeExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.IncomeExportVo">
 		<result property="empName" column="EMP_NAME"/>
@@ -173,6 +174,7 @@
 		<where>
 			1=1
 			<include refid="export_sql"/>
+			order by a.CREATE_TIME DESC
 			<if test="tIncome != null">
 				<if test="tIncome.limitStart != null">
 					limit #{tIncome.limitStart},#{tIncome.limitEnd}
@@ -229,4 +231,42 @@
 			and <![CDATA[sql]]>
 		</if>
 	</sql>
+
+	<update id="updateIncomeById" parameterType="java.util.List">
+		update t_income
+		<trim prefix="set" suffixOverrides=",">
+			<trim prefix="SEND_STATUS =case" suffix="end,">
+				<foreach collection="list" item="i" index="index">
+					<if test="i.sendStatus!=null">
+						when ID=#{i.id} then #{i.sendStatus}
+					</if>
+				</foreach>
+			</trim>
+			<trim prefix="SEND_TIME =case" suffix="end,">
+				<foreach collection="list" item="i" index="index">
+					<if test="i.sendTime!=null">
+						when ID=#{i.id} then #{i.sendTime}
+					</if>
+				</foreach>
+			</trim>
+			<trim prefix="SEND_MONTH =case" suffix="end,">
+				<foreach collection="list" item="i" index="index">
+					<if test="i.sendMonth!=null">
+						when ID=#{i.id} then #{i.sendMonth}
+					</if>
+				</foreach>
+			</trim>
+			<trim prefix="EKP_ID =case" suffix="end,">
+				<foreach collection="list" item="i" index="index">
+					<if test="i.ekpId!=null">
+						when ID=#{i.id} then #{i.ekpId}
+					</if>
+				</foreach>
+			</trim>
+		</trim>
+		where
+		<foreach collection="list" separator="or" item="i" index="index" >
+			ID=#{i.id}
+		</foreach>
+	</update>
 </mapper>