Commit e2f93d26 authored by fangxinjiang's avatar fangxinjiang

版本切换-fxj

parent dd51c838
...@@ -547,6 +547,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -547,6 +547,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.multiply(new BigDecimal(day)) .multiply(new BigDecimal(day))
.divide(new BigDecimal("365"), 2, RoundingMode.HALF_UP) .divide(new BigDecimal("365"), 2, RoundingMode.HALF_UP)
.add(new BigDecimal("5.00"))); .add(new BigDecimal("5.00")));
//按月计费方式
}else if (null != detail.getBillingType() && CommonConstants.ONE_INT == detail.getBillingType().intValue()){
TInsuranceTypeRate typeRate = tInsuranceTypeRateService.getOne(Wrappers.<TInsuranceTypeRate>query().lambda() TInsuranceTypeRate typeRate = tInsuranceTypeRateService.getOne(Wrappers.<TInsuranceTypeRate>query().lambda()
.eq(TInsuranceTypeRate::getInsuranceTypeId, detail.getInsuranceTypeId()) .eq(TInsuranceTypeRate::getInsuranceTypeId, detail.getInsuranceTypeId())
.eq(TInsuranceTypeRate::getMonth, purchaseCycle) .eq(TInsuranceTypeRate::getMonth, purchaseCycle)
...@@ -556,8 +558,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -556,8 +558,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (null != typeRate){ if (null != typeRate){
detail.setRate(new BigDecimal(typeRate.getRate())); detail.setRate(new BigDecimal(typeRate.getRate()));
} }
//按月计费方式
}else if (null != detail.getBillingType() && CommonConstants.ONE_INT == detail.getBillingType().intValue()){
detail.setEstimatePremium(new BigDecimal(detail.getBuyStandard()) detail.setEstimatePremium(new BigDecimal(detail.getBuyStandard())
.multiply(null== detail.getRate()?BigDecimal.ZERO: detail.getRate()) .multiply(null== detail.getRate()?BigDecimal.ZERO: detail.getRate())
.add(new BigDecimal("5.00"))); .add(new BigDecimal("5.00")));
...@@ -2098,7 +2098,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2098,7 +2098,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
// 预估保费 = 费率 * 购买标准 + 5元 // 预估保费 = 费率 * 购买标准 + 5元
BigDecimal estimatePremium = new BigDecimal(detail.getBuyStandard()) BigDecimal estimatePremium = new BigDecimal(detail.getBuyStandard())
.multiply(detail.getRate()) .multiply(detail.getRate())
.add(BigDecimal.valueOf(5.00))
.setScale(2,BigDecimal.ROUND_HALF_UP); .setScale(2,BigDecimal.ROUND_HALF_UP);
detail.setEstimatePremium(estimatePremium); detail.setEstimatePremium(estimatePremium);
if (detail.getBuyType() == CommonConstants.THREE_INT){ if (detail.getBuyType() == CommonConstants.THREE_INT){
...@@ -2142,8 +2141,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2142,8 +2141,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//预估保费 = (购买标准 / 365) * 天数 + 5元 //预估保费 = (购买标准 / 365) * 天数 + 5元
BigDecimal estimatePremium = new BigDecimal(detail.getBuyStandard()) BigDecimal estimatePremium = new BigDecimal(detail.getBuyStandard())
.multiply(new BigDecimal(day)) .multiply(new BigDecimal(day))
.divide(new BigDecimal("365"),CommonConstants.TWO_INT,BigDecimal.ROUND_HALF_UP) .divide(new BigDecimal("365"),CommonConstants.TWO_INT,BigDecimal.ROUND_HALF_UP);
.add(BigDecimal.valueOf(5.00));
detail.setEstimatePremium(estimatePremium); detail.setEstimatePremium(estimatePremium);
//记录状态均置为「已投保」 //记录状态均置为「已投保」
detail.setBuyHandleStatus(CommonConstants.THREE_INT); detail.setBuyHandleStatus(CommonConstants.THREE_INT);
......
...@@ -737,7 +737,8 @@ public class DoJointInsuranceTask { ...@@ -737,7 +737,8 @@ public class DoJointInsuranceTask {
} }
//红冲 //红冲
if (InsurancesConstants.CORRECT_SETTLE_BILL.equals(param.getInteractiveType()) && "否".equals(param.getBpoFlag())) { if (InsurancesConstants.CORRECT_SETTLE_BILL.equals(param.getInteractiveType())
&& ("否".equals(param.getBpoFlag()) || "0".equals(param.getIsJfcd()))) {
EkpInsurancesInfo pushParam = new EkpInsurancesInfo(); EkpInsurancesInfo pushParam = new EkpInsurancesInfo();
String code = ""; String code = "";
if (InsurancesConstants.ESTIMATE_SETTLE_BILL.equals(param.getSettleType())) { if (InsurancesConstants.ESTIMATE_SETTLE_BILL.equals(param.getSettleType())) {
......
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