Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java

@@ -341,12 +341,7 @@ public class DoJointInsuranceTask {
 	public void updateSalarySettleStatus(EkpStatusParamVo vo) {
 		List<EkpSocialViewVo> viewVo;
 		try {
-			//根据结算单号获取明细id和结算状态
-			viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
-			if (!viewVo.isEmpty()) {
-				viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
-				R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
-				if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
+			//薪资结算状态同步暂时解决方案为定时任务去更新
 			TUpdateStatusError error = new TUpdateStatusError();
 			error.setSettleNo(vo.getSettleNo());
 			error.setStatus(CommonConstants.ZERO_INT);
@@ -355,8 +350,22 @@ public class DoJointInsuranceTask {
 			error.setCreateTime(DateUtil.getCurrentDateTime());
 			error.setSettleType(vo.getPayFlag());
 			updateStatusErrorMapper.insert(error);
-				}
-			}
+//			//根据结算单号获取明细id和结算状态
+//			viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
+//			if (!viewVo.isEmpty()) {
+//				viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
+//				R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
+//				if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
+//					TUpdateStatusError error = new TUpdateStatusError();
+//					error.setSettleNo(vo.getSettleNo());
+//					error.setStatus(CommonConstants.ZERO_INT);
+//					error.setTitle("薪资结算状态同步失败");
+//					error.setTypeFlag(CommonConstants.FIVE_STRING);
+//					error.setCreateTime(DateUtil.getCurrentDateTime());
+//					error.setSettleType(vo.getPayFlag());
+//					updateStatusErrorMapper.insert(error);
+//				}
+//			}
 		} catch (Exception e) {
 			TUpdateStatusError error = new TUpdateStatusError();
 			error.setSettleNo(vo.getSettleNo());

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

@@ -2405,8 +2405,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					initEkpPushSocialParam(unPushInfo,true,selectVoMap);
 				}
 			}
-			unPushInfo.clear();
-			selectVoMap.clear();
+//			unPushInfo.clear();
+//			selectVoMap.clear();
 		}
 	}
 
@@ -2442,8 +2442,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					initEkpPushFundParam(unPushInfo,true,selectVoMap);
 				}
 			}
-			unPushInfo.clear();
-			selectVoMap.clear();
+//			unPushInfo.clear();
+//			selectVoMap.clear();
 		}
 	}