Commit 685056be authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14

parents 71fd74af d7f2dc66
...@@ -472,10 +472,14 @@ public class InsurancesConstants { ...@@ -472,10 +472,14 @@ public class InsurancesConstants {
* 商险已结算,无法登记保单保费 * 商险已结算,无法登记保单保费
*/ */
public static final String SETTLE_HANDLE_THREE_NOT_REGISTERED = "商险已结算,无法登记保单保费"; public static final String SETTLE_HANDLE_THREE_NOT_REGISTERED = "商险已结算,无法登记保单保费";
/**
* 商险支出中,无法登记保单保费
*/
public static final String PAY_SETTLE_ONE_NOT_REGISTERED = "商险支出中,无法登记保单保费";
/** /**
* 商险已支出,无法登记保单保费 * 商险已支出,无法登记保单保费
*/ */
public static final String PAY_SETTLE_NOT_REGISTERED = "商险已支出,无法登记保单保费"; public static final String PAY_SETTLE_TWO_NOT_REGISTERED = "商险已支出,无法登记保单保费";
/** /**
* 保单号不存在或已过期 * 保单号不存在或已过期
*/ */
......
...@@ -4123,14 +4123,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -4123,14 +4123,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
} }
// 商险已支出,无法登记保单保费 // 商险已支出,无法登记保单保费
if(Common.isNotNull(settleStatus.getPayStatus()) && InsurancesConstants.SETTLE_TWO.equals(settleStatus.getPayStatus())) { if(Common.isNotNull(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_NOT_REGISTERED); //保费更新或者保单号发票号更新
if (InsurancesConstants.SETTLE_TWO.equals(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_TWO_NOT_REGISTERED);
continue;
}
if (InsurancesConstants.SETTLE_ONE.equals(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_ONE_NOT_REGISTERED);
continue; continue;
} }
} }
} }
} }
} }
}
param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS); param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS);
param.setFlag(CommonConstants.ZERO_STRING); param.setFlag(CommonConstants.ZERO_STRING);
//所有校验通过后设置查到的结果 //所有校验通过后设置查到的结果
......
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