Commit 925aa299 authored by huyuchen's avatar huyuchen

ekp推送接口修改

parent ccb43d41
...@@ -1295,10 +1295,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1295,10 +1295,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceSettleService.save(settle); tInsuranceSettleService.save(settle);
detail.setDefaultSettleId(settle.getId()); detail.setDefaultSettleId(settle.getId());
successList.add(detail); successList.add(detail);
if (detail.getBuyType() != CommonConstants.FOUR_INT) {
//生成收入数据 //生成收入数据
createInsuranceInfo(detail); createInsuranceInfo(detail);
}
}else { }else {
//按天 //按天
//计算起止时间的天数 //计算起止时间的天数
...@@ -1331,12 +1329,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1331,12 +1329,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceSettleService.save(settle); tInsuranceSettleService.save(settle);
detail.setDefaultSettleId(settle.getId()); detail.setDefaultSettleId(settle.getId());
successList.add(detail); successList.add(detail);
if (detail.getBuyType() != CommonConstants.FOUR_INT) {
//生成收入数据 //生成收入数据
createInsuranceInfo(detail); createInsuranceInfo(detail);
} }
} }
}
//实缴 //实缴
if(detail.getSettleType() == CommonConstants.ONE_INT){ if(detail.getSettleType() == CommonConstants.ONE_INT){
if (detail.getBuyType() == CommonConstants.THREE_INT){ if (detail.getBuyType() == CommonConstants.THREE_INT){
...@@ -6119,11 +6115,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6119,11 +6115,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
BigDecimal sumMoney = BigDecimal.ZERO; BigDecimal sumMoney = BigDecimal.ZERO;
for (TIncomeDetail income : incomeDetailList) { for (TIncomeDetail income : incomeDetailList) {
sumMoney = BigDecimalUtils.safeAdd(income.getMoney(), sumMoney); sumMoney = BigDecimalUtils.safeAdd(income.getMoney(), sumMoney);
}
if (sumMoney.compareTo(BigDecimal.ZERO) > 0) { if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
isExist = true; isExist = true;
} }
} }
}
//预估或者实缴保费 //预估或者实缴保费
BigDecimal fee; BigDecimal fee;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment