年终奖测算工具修改

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

@@ -2223,6 +2223,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (CommonConstants.ZERO_STRING.equals(settleDomain.getSocialType())) {
+				continue;
+			}
 			EkpPushSocialParam socialParam = new EkpPushSocialParam();
 			//员工姓名
 			socialParam.setFd_3adfe8c79989d4(library.getEmpName());
@@ -2451,6 +2454,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (CommonConstants.ZERO_STRING.equals(settleDomain.getFundType())) {
+				continue;
+			}
 			EkpPushFundParam fundParam = new EkpPushFundParam();
 			//员工姓名
 			fundParam.setFd_3adfe8c79989d4(library.getEmpName());

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

@@ -2381,8 +2381,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//订单类型
 			socialParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
 			//是否有预估
-			if (Common.isNotNull(settleDomain.getMrSettleType()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+			if (Common.isNotNull(settleDomain.getSocialType()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getSocialType())) {
 				socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
 			} else {
 				socialParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);
@@ -2598,8 +2598,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//订单类型
 			fundParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
 			//是否有预估
-			if (Common.isNotNull(settleDomain.getMrSettleType()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+			if (Common.isNotNull(settleDomain.getFundType()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getFundType())) {
 				fundParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
 			} else {
 				fundParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);