Commit 699b4798 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent 603d4439
...@@ -1779,12 +1779,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1779,12 +1779,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
// 记录状态置为「退回」 // 记录状态置为「退回」
detail.setBuyHandleStatus(CommonConstants.FOUR_INT); detail.setBuyHandleStatus(CommonConstants.FOUR_INT);
detail.setPaymentTime(CommonConstants.EMPTY_STRING); if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd())){
detail.setPaymentStatus(CommonConstants.ZERO_STRING); detail.setPaymentTime(CommonConstants.EMPTY_STRING);
//添加日志 detail.setPaymentStatus(CommonConstants.ZERO_STRING);
newDetail.setPaymentTime(CommonConstants.EMPTY_STRING); //添加日志
newDetail.setPaymentStatus(CommonConstants.ZERO_STRING); newDetail.setPaymentTime(CommonConstants.EMPTY_STRING);
tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,newDetail,"投保退回更新缴费状态、缴费时间",user.getNickname()); newDetail.setPaymentStatus(CommonConstants.ZERO_STRING);
tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,newDetail,"投保退回更新缴费状态、缴费时间",user.getNickname());
}
//投保成功后再次投保退回,需要将保单生效日期、是否有效、是否过期置为空 //投保成功后再次投保退回,需要将保单生效日期、是否有效、是否过期置为空
if (detail.getSignFlag() == CommonConstants.ONE_INT){ if (detail.getSignFlag() == CommonConstants.ONE_INT){
detail.setHandledTime(null); detail.setHandledTime(null);
......
...@@ -661,7 +661,7 @@ public class DoJointInsuranceTask { ...@@ -661,7 +661,7 @@ public class DoJointInsuranceTask {
} }
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType())){ if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType())){
//应收=实缴的应支-预估的应收 //应收=实缴的应支-预估的应收
ys = BigDecimalUtils.safeSubtract(param.getActualPremium(),param.getEstimatePremium()).doubleValue(); ys = BigDecimalUtils.subtractAllowNegative(param.getActualPremium(),param.getEstimatePremium()).doubleValue();
} }
} }
} else if ("0".equals(param.getIsJfcd())){ } else if ("0".equals(param.getIsJfcd())){
......
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