Commit 7f8e22bb authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 1ef13017
...@@ -248,8 +248,8 @@ public class DoJointInsuranceTask { ...@@ -248,8 +248,8 @@ public class DoJointInsuranceTask {
if (Common.isNotNull(viewVo.getId())) { if (Common.isNotNull(viewVo.getId())) {
insuranceId = viewVo.getId().substring(0, 19); insuranceId = viewVo.getId().substring(0, 19);
detail = insuranceDetailMapper.selectById(insuranceId); detail = insuranceDetailMapper.selectById(insuranceId);
log.error("更新状态商险ID:"+detail.getId() +"|"+insuranceId);
if (Common.isNotNull(detail)) { if (Common.isNotNull(detail)) {
log.error("更新状态商险ID:"+detail.getId() +"|"+insuranceId);
TInsuranceDetail detailOld = new TInsuranceDetail(); TInsuranceDetail detailOld = new TInsuranceDetail();
BeanCopyUtils.copyProperties(detail,detailOld); BeanCopyUtils.copyProperties(detail,detailOld);
//判断订单类型是预估还是实缴 //判断订单类型是预估还是实缴
...@@ -268,9 +268,7 @@ public class DoJointInsuranceTask { ...@@ -268,9 +268,7 @@ public class DoJointInsuranceTask {
detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag()); detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
// 这里就是EKP 同步已收及垫付后同步HRO的特殊处理 // 这里就是EKP 同步已收及垫付后同步HRO的特殊处理
if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd()) && "0".equals(vo.getPaymentStatsus())){ if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd()) && "0".equals(vo.getPaymentStatsus())){
if (CommonConstants.ZERO_STRING.equals(detail.getPaymentStatus()) if (CommonConstants.SIX_INT == detail.getBuyHandleStatus().intValue()){
&&("0".equals(viewVo.getIncomeCollectFlag())
|| "2".equals(viewVo.getIncomeCollectFlag()))){
detail.setBuyHandleStatus(CommonConstants.ONE_INT); detail.setBuyHandleStatus(CommonConstants.ONE_INT);
detail.setPaymentStatus(CommonConstants.ONE_STRING); detail.setPaymentStatus(CommonConstants.ONE_STRING);
detail.setPaymentTime(DateUtil.formatDatePatten(new Date(),DateUtil.DATETIME_PATTERN_SECOND)); detail.setPaymentTime(DateUtil.formatDatePatten(new Date(),DateUtil.DATETIME_PATTERN_SECOND));
...@@ -289,15 +287,6 @@ public class DoJointInsuranceTask { ...@@ -289,15 +287,6 @@ public class DoJointInsuranceTask {
.set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.SEVEN_STRING); .set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.SEVEN_STRING);
tInsurancePreRenewDetailMapper.update(null, updateReNewInfoWrapper); tInsurancePreRenewDetailMapper.update(null, updateReNewInfoWrapper);
} }
if (CommonConstants.ONE_STRING.equals(detail.getPaymentStatus())
&& "1".equals(viewVo.getIncomeCollectFlag())){
detail.setBuyHandleStatus(CommonConstants.SIX_INT);
detail.setPaymentStatus(CommonConstants.ZERO_STRING);
detail.setPaymentTime(CommonConstants.EMPTY_STRING);
detail.setUpdateBy("05501879fed711eca3540242ac110010");
detail.setUpdateTime(LocalDateTime.now());
tBusinessOperateService.saveModificationRecord(detail.getId(),detailOld,detail,"收款结算单退单或撤销匹配同步更新投保状态为待缴费","EKP系统");
}
} }
} else { } else {
detail.setPaySettleFlag(viewVo.getPaySettleFlag()); detail.setPaySettleFlag(viewVo.getPaySettleFlag());
......
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