diff --git a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java index 26c4782eb9d2ba9f99f5651af9432c458adedcbf..a91386bc07fc1c217fec6c533c063e0148f27e2e 100644 --- a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java +++ b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java @@ -5597,6 +5597,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap BeanCopyUtils.copyProperties(tInsuranceDetail,param); param.setDetailId(tInsuranceDetail.getId()); Integer settleType = tInsuranceDetail.getSettleType(); + BigDecimal actualPremium = tInsuranceDetail.getActualPremium(); + BigDecimal estimatePremium = tInsuranceDetail.getEstimatePremium(); if(CommonConstants.ZERO_INT == settleType){ param.setEstimateStatus(EkpConstants.HAVE); }else { @@ -5629,8 +5631,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap String defaultSettleId = tInsuranceDetail.getDefaultSettleId(); TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId); //冲æ£å–è´Ÿæ•° - if(null != byId.getEstimatePremium()){ - param.setEstimatePremium(byId.getEstimatePremium().negate()); + if(null != estimatePremium){ + param.setEstimatePremium(estimatePremium); } param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL); param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); @@ -5641,8 +5643,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap String defaultSettleId = tInsuranceDetail.getDefaultSettleId(); TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId); //冲æ£å–è´Ÿæ•° - if(null != byId.getActualPremium()){ - param.setActualPremium(byId.getActualPremium().negate()); + if(null != estimatePremium){ + param.setActualPremium(actualPremium); } param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL); param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);