BUG：公积金办理成功 推送

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

@@ -3595,15 +3595,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										if (Common.isNotNull(libraryFundInfoList)) {
 											for (TForecastLibrary library :libraryFundInfoList) {
 												//办理成功生成收入
-												/*socialTask.asynchronousDisPatchHandle(null,0,null,library,CommonConstants.THREE_INT);
-												if (CommonConstants.ZERO_INT == library.getDataPush()) {
-													libraryFundInfoList1.add(library);
-												}*/
-												socialTask.asynchronousDisPatchHandleForDispatch(library,CommonConstants.ZERO_INT == library.getDataPush());
+												if (Common.isNotNull(library.getDataPush())){
+													socialTask.asynchronousDisPatchHandleForDispatch(library,CommonConstants.ZERO_INT == library.getDataPush().intValue());
+												}
 											}
-											/*if (Common.isNotNull(libraryFundInfoList1)) {
-												socialTask.asynchronousDisPatchHandle(null,0,libraryFundInfoList1,null,CommonConstants.TWO_INT);
-											}*/
 										}
 									}
 
@@ -3630,24 +3625,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								socialInfo.setReduceHandleUser(user.getId());
 								socialInfo.setReduceHandleTime(now);
 								//社保派减办理成功才变更社保的办理状态
-								/*if (CommonConstants.ZERO_INT == flag) {
-									socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
-									socialInfo.setReduceHandleUser(user.getId());
-									socialInfo.setReduceHandleTime(now);
-									if (Common.isNotNull(dis.getSocialReduceDate())) {
-										socialInfo.setSocialReduceDate(dis.getSocialReduceDate());
-										sf.setSocialReduceDate(dis.getSocialReduceDate());
-									}
-									sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
-									sf.setSocialStatus(CommonConstants.EIGHT_STRING);
-								}
-								if (CommonConstants.ONE_INT == flag) {
-									//派减办理不通过
-									socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
-									sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
-									sf.setSocialStatus(CommonConstants.NINE_STRING);
-									sf.setSocialReduceDate(null);
-								}*/
 								socialInfo.setHandleTime(now);
 								socialInfo.setHandleUser(user.getId());
 								socialInfo.setHandleUserName(user.getNickname());
@@ -3788,11 +3765,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								// 派增办理，全部失败 同步预估库数据
 								socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 							}
-							// 社保办理只要办理成功就刷新预估数据  公积金办理不用处理
-							if (Common.isNotNull(dis.getSocialId())
+							// 社保办理只要办理成功就刷新预估数据  公积金办理不用处理（前面公积金办理成功的时候处理过了）
+							if (CommonConstants.ZERO_STRING.equals(typeSub)
+									&& (Common.isNotNull(dis.getSocialId())
 									&& CommonConstants.FOUR_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.TWO_STRING.equals(sf.getSocialStatus())
-									|| CommonConstants.THREE_STRING.equals(sf.getSocialStatus())){
+									|| CommonConstants.THREE_STRING.equals(sf.getSocialStatus()))){
 								if (partSuccess){
 									forecastLibraryService.updateForecastLibaryByDispatch(sf);
 								}else {

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

@@ -1914,16 +1914,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				}
 			}
 		}
-
-		if (Common.isNotNull(socialFundInfo.getSocialId())
-				&& CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus())
+		if (Common.isNotNull(socialFundInfo.getSocialId()) && CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus())
 				|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) {
 
 			//获取所有的预估数据
 			List<TForecastLibrary> librarySocialInfoList1 = new ArrayList<>();
 			List<TForecastLibrary> librarySocialInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
 					.eq(TForecastLibrary::getEmpIdcard, empIdCard)
-					.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)
+					//.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)
 					.eq(TForecastLibrary::getSettleDomainId, socialFundInfo.getSettleDomain())
 					.in(TForecastLibrary::getSocialPayMonth, payMonthList));
 			if (Common.isNotNull(librarySocialInfoList)) {