Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!238

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

@@ -5597,8 +5597,6 @@ 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 {
@@ -5631,8 +5629,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			String defaultSettleId = tInsuranceDetail.getDefaultSettleId();
 			TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId);
 			//冲正取负数
-			if(null != estimatePremium){
-				param.setEstimatePremium(estimatePremium);
+			if(null != byId.getEstimatePremium()){
+				param.setEstimatePremium(byId.getEstimatePremium());
 			}
 			param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
@@ -5643,8 +5641,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			String defaultSettleId = tInsuranceDetail.getDefaultSettleId();
 			TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId);
 			//冲正取负数
-			if(null != estimatePremium){
-				param.setActualPremium(actualPremium);
+			if(null != byId.getActualPremium()){
+				param.setActualPremium(byId.getActualPremium());
 			}
 			param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);