Commit 09c76273 authored by huyuchen's avatar huyuchen

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

parents fd189a67 1876321f
...@@ -298,6 +298,15 @@ public class ChecksUtil { ...@@ -298,6 +298,15 @@ public class ChecksUtil {
if (mobileList.size() > CommonConstants.ZERO_INT){ if (mobileList.size() > CommonConstants.ZERO_INT){
TCheckMobile mobile = null; TCheckMobile mobile = null;
for (String mb : mobileList){ for (String mb : mobileList){
//广电号码放行,硬编码 后续要优化
if (mb.indexOf("192") == 0){
mobile = new TCheckMobile();
mobile.setMobile(mb);
mobile.setStatus(CommonConstants.ONE_STRING);
mobile.setMessage("广电号码放行");
checkMobileMap.put(mb,mobile);
continue;
}
jsonObject = ChecksUtil.invokeMobileBasic(mb); jsonObject = ChecksUtil.invokeMobileBasic(mb);
// 2.处理返回结果 // 2.处理返回结果
if (jsonObject != null) { if (jsonObject != null) {
...@@ -342,10 +351,19 @@ public class ChecksUtil { ...@@ -342,10 +351,19 @@ public class ChecksUtil {
} }
} else { } else {
// 记录错误日志,正式项目中请换成log打印 // 记录错误日志,正式项目中请换成log打印
return R.failed("手机号校验失败:" + jsonObject.get(ChecksConstants.MESSAGE).getAsString()); //return R.failed("手机号校验失败:" + jsonObject.get(ChecksConstants.MESSAGE).getAsString());
mobile = new TCheckMobile();
mobile.setMobile(mb);
mobile.setStatus(CommonConstants.TEN_STRING);
mobile.setMessage(getJsonElementValue(jsonObject.get(ChecksConstants.MESSAGE))+getJsonElementValue(jsonObject.get(ChecksConstants.REMARK)));
checkMobileMap.put(mb,mobile);
} }
} else { } else {
return R.failed(ChecksConstants.NO_DATA_RESULT); mobile = new TCheckMobile();
mobile.setMobile(mb);
mobile.setStatus(CommonConstants.TEN_STRING);
mobile.setMessage("调用第三方服务失败!");
checkMobileMap.put(mb,mobile);
} }
} }
} }
......
...@@ -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