年终奖测算工具修改

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

@@ -1276,8 +1276,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								tInsuranceSettleService.save(settle);
 								detail.setDefaultSettleId(settle.getId());
 								successList.add(detail);
+								if (detail.getBuyType() != CommonConstants.FOUR_INT) {
 									//生成收入数据
 									createInsuranceInfo(detail);
+								}
 							}else {
 								//按天
 								//计算起止时间的天数
@@ -1310,10 +1312,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								tInsuranceSettleService.save(settle);
 								detail.setDefaultSettleId(settle.getId());
 								successList.add(detail);
+								if (detail.getBuyType() != CommonConstants.FOUR_INT) {
 									//生成收入数据
 									createInsuranceInfo(detail);
 								}
 							}
+						}
 						//实缴
 						if(detail.getSettleType() == CommonConstants.ONE_INT){
 							if (detail.getBuyType() == CommonConstants.THREE_INT){
@@ -5782,7 +5786,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		int isSum = 0;
 		if (Common.isNotNull(settleDomain)) {
 			// 含有商险，则计算收入
-			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem().contains(CommonConstants.THREE_STRING)) {
+			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())) {
@@ -5812,7 +5817,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 				}
 			}
-			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem().contains(CommonConstants.THREE_STRING)) {
+			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
+					.contains(CommonConstants.THREE_STRING)) {
 				//预估模式
 				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) &&
 						CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {