生成收入接口修改

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

@@ -4084,9 +4084,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
 					.contains(CommonConstants.TWO_STRING)) {
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
 					//预估模式
-				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) &&
-						CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
+					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						if (!isExist) {
 							createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
 									settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
@@ -4114,6 +4114,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 			}
 		}
+	}
 
 	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
 									  String charges, String feeMode, BigDecimal money) {

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

@@ -2448,7 +2448,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING);
 			}
 			//客户名称
-			socialParam.setFd_3adfe8c81a0e42(library.getUnitName());
+			if (Common.isNotNull(settleDomain.getCustomerName())) {
+				socialParam.setFd_3adfe8c81a0e42(settleDomain.getCustomerName());
+			} else {
+				socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
+			}
 			//社保户
 			if (Common.isNotNull(library.getSocialHouseholdName())) {
 				socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName());
@@ -2666,7 +2670,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			//个人代缴
 			fundParam.setFd_3adfeb5366dd82(CommonConstants.EMPTY_STRING);
 			//客户名称
-			fundParam.setFd_3adfe8c81a0e42(library.getUnitName());
+			if (Common.isNotNull(settleDomain.getCustomerName())) {
+				fundParam.setFd_3adfe8c81a0e42(settleDomain.getCustomerName());
+			} else {
+				fundParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
+			}
 			//公积金账户
 			if (Common.isNotNull(library.getProvidentHouseholdName())) {
 				fundParam.setFd_3aeafa8cc144bc(library.getProvidentHouseholdName());
@@ -2835,8 +2843,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					&& CommonConstants.ONE_STRING.equals(sourceType)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
 					&& CommonConstants.TWO_STRING.equals(sourceType)))) {
 				//预估模式
-				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) &&
-						CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
+					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						if (!isExist) {
 							createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
 									settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
@@ -2865,6 +2873,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				}
 			}
 		}
+	}
 
 	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
 									  String charges, String feeMode, BigDecimal money, String sourceType) {

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

@@ -2842,8 +2842,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
 						&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
 					//预估模式
-					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) &&
-							CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
+					if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
+						if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 							if (!exitFlag) {
 								createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.TWO_STRING,
 										settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
@@ -2878,6 +2878,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 				}
 			}
+		}
 		incomeService.saveBathDetail(detailList);
 	}